Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f

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