Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 24625933313891b12d198b84c1d6f42d041fd3d7

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