Merge branch 'master' into 'master'

Marius Cramer

2015-09-14 35a93a75cf6eea4d93288936366481d32f63dfb9

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