Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-13 3cf77b791fb646e5837dac63a2e8c06604771b1d

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