Merge branch 'master' into 'master'

Marius Cramer

2015-06-22 5b3c29178704c047d4020df2ae445ff01c6e1f3a

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