Merge branch 'master' into 'master'

Marius Burkard

2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd

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