Merge branch 'patch-1' into 'stable-3.1'

Till Brehm

2016-05-22 c2560aca4af9c7713d47fd6c0b988f901fc41968

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