Merge branch 'master' into 'master'

Marius Cramer

2015-04-30 54f105466f1ac43426771a72787c29c1787ceea9

1
2
3
4
 
The installation instructions for ISPConfig can be found here:
 
http://www.ispconfig.org/page/en/documentation.html