Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 fef8248f430365a100bd585196ef7cdc04e5c131

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