Merge remote-tracking branch 'origin/patches_list' into 2.1
authorKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 13:33:32 +0000 (14:33 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 13:33:32 +0000 (14:33 +0100)

Trivial merge