Merge branch 'master' into 'master'

Marius Cramer

2015-07-08 374226ae8d8c90954df425fc029b10f4e05d709e

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