Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-29 4e52e111c859bc586d0379c7cda59111555c9ac0

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