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)
commitf6631443a100bb740457c784605943884fcfc036
tree81501d454378397f37b198930c64b769c4828d4a
parent87ad4dd2641cd199c0cf7c75e0f9a145104afa76
parent67a71ff10faf40da53393671e65424741bd73198
Merge pull request #3922 from RealRancor/backport_3916_2.0

Backport #3916 to 2.0 - thanks