Merge branch 'master' into 'master'

Marius Cramer

2014-04-30 e25e407913f0248ba6d68fa80b001b0f4621d99a

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