Merge branch 'master' into 'master'

Marius Cramer

2015-07-10 4e5e9b5acfdfddc1d8b671890d271a53e5598862

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