Merge branch 'master' into 'master'

Marius Burkard

2015-11-30 e6ded3ab52b8b823660181db85be511b2ef1ffe5

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