Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

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