Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

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