Merge branch 'master' into 'master'

Marius Cramer

2015-04-17 3299ad410a586b452f2ae087a2c3df0e64831e34

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