Merge branch 'patch-1' into 'master'

Marius Burkard

2016-03-30 e004715f9a4eea0eeb7eb5c620ff3e973696d5e7

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