Merge branch 'master' into 'master'

Marius Cramer

2015-11-11 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c

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