Merge branch 'master' into 'master'

Marius Cramer

2015-03-31 e146fe8cebdf9201ccd67b37333a6c423ac5c1f4

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