Merge branch 'patch-1' into 'stable-3.1'

Marius Burkard

2016-03-14 65c80f1a80caed31a3e9322a90b13577fe87496e

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