Merge remote-tracking branch 'origin/2.0'
authorDaniel Molkentin <danimo@owncloud.com>
Wed, 4 Nov 2015 13:25:14 +0000 (14:25 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Wed, 4 Nov 2015 13:25:14 +0000 (14:25 +0100)

Trivial merge