Merge remote-tracking branch 'dweismueller/owncloud-7' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)

Trivial merge