Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 9f65de0b6bbfb0824e34088029e4f593a28303e1

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