Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 10131039b1669f3bd4485ab71c33505de0dd377c

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