Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 8425758229434b37442a9af5cf3cbe210cc696b4

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