Merge branch 'master' into 'master'

Marius Cramer

2015-03-01 e2e00df25e5561131b5b50d332f0de712b4244c7

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