Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

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