Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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