Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 bd9fee743194897c10a90f9f5b49f41f52a2284a

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