Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

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