Merge branch 'master' into 'master'

Marius Cramer

2015-02-03 3dc6299457c24e0081baae684f6992b5def630ef

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