Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-12 ae3e7aade5800213dd5c0a75f69344ce2097f35d

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