Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-29 dad105ff4110e29a584af3e5dc75c0f3cfcd0dce

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