Merge branch 'owncloud' 2.0
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 30 Jul 2016 09:21:23 +0000 (11:21 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 30 Jul 2016 09:21:23 +0000 (11:21 +0200)

Trivial merge