Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-22 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf

1
2
3
4
 
Please see issue tracker for feature requests and bug reports.
 
http://git.ispconfig.org/ispconfig/ispconfig3/issues