Merge branch 'master' into 'master'

Marius Cramer

2014-08-11 3f6ee66f65e910f741425078921bc804f91f8246

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