Merge branch 'master' into 'master'

Marius Cramer

2015-07-09 e2963947c8428a8bae4a013e8c88dc4bdf299075

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