Merge branch 'master' into 'master'

Marius Burkard

2015-11-26 add7cc461c0729819c73b2bf44076037a1592517

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