Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 1e24e990804732a0f6981cd2db7fda2da11b29ed

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