Merge branch 'master' into 'master'

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

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