Merge branch 'master' into 'master'

Marius Cramer

2014-03-25 f2851d17638c18984387c1bcca3b80152ad4b21a

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