Merge branch 'master' into 'master'

Marius Cramer

2015-09-24 9f557ddc325b64fd8e01d987cdc28e505d9434d5

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