Merge branch 'master' into 'master'

Marius Cramer

2015-07-30 a014597671651cdc10f88a2816ea39b9f1451666

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