Merge branch 'master' into 'master'

Marius Cramer

2015-05-27 28eaf22574fcf1b82c2794ce0c7af971aed1baa0

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