Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-12-21 b25f400cd6bc255b01e05ac274f050ba4039a411

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