Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 7198764e180cf0af9f619a9079beeb12c286cf4a

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