Merge branch 'master' into 'master'

Falko Timme

2014-12-13 62fd31b9f97bc43dff837dcf525798153bfa2c98

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