Merge branch 'master' into 'master'

Marius Cramer

2014-06-12 d3be569127300fa335a659c3ea40c100763d5fa9

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