From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 30 Jul 2016 09:21:23 +0000 (+0200)
Subject: Merge branch 'owncloud'
X-Git-Tag: 2.0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38ff6d1ec3f702171190b10965b95b0421a9a0a7;p=people%2Fstevee%2Fguardian.git

Merge branch 'owncloud'
---

05211e1685df6f1692cd7bf8a89a2457c1101b7a