Merge branch 'master' into 'master'

Marius Cramer

2014-03-29 85e29ab6d2cd43e348cba2c6a73a7263217d139d

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