Merge branch 'master' into 'master'

Marius Cramer

2015-03-09 e564b4796a4256a67328e117c9675ccae7d872cd

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