Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-14 f18c9cec9b720cab6e9961a3b024cf696146d605

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