Merge branch 'stable-3.1'

Marius Burkard

2016-07-05 165177508f6541b4d0924c6625eb216a9a5a549a

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