Merge branch 'master' into 'master'

Marius Cramer

2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec

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