Merge branch 'master' into 'master'

Marius Cramer

2015-01-14 9bde82f26b822f1ef59277796492f363c0f6288f

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