Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 745891b61677d554092e91f3053421b98f098a69

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