Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

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