Merge branch 'master' into 'master'

Marius Cramer

2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520

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