Merge branch 'master' of github.com:owncloud/mirall
authorKlaas Freitag <freitag@owncloud.com>
Mon, 16 Nov 2015 17:16:58 +0000 (18:16 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Mon, 16 Nov 2015 17:16:58 +0000 (18:16 +0100)

Trivial merge