Merge branch 'fix-ftp-pwreset-issue' into 'stable-3.1'

Till Brehm

2016-06-14 9aa347811e4825781ff5cafbcb78b70ff5e25c6d

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