Merge pull request #3922 from RealRancor/backport_3916_2.0
authorKlaas Freitag <freitag@owncloud.com>
Tue, 6 Oct 2015 12:42:40 +0000 (14:42 +0200)
committerKlaas Freitag <freitag@owncloud.com>
Tue, 6 Oct 2015 12:42:40 +0000 (14:42 +0200)
Backport #3916 to 2.0 - thanks


Trivial merge