From: Michael Tremer Date: Wed, 30 Jul 2014 11:15:33 +0000 (+0200) Subject: Merge remote-tracking branch 'dweismueller/owncloud-7' into next X-Git-Tag: v2.15-core82~6^2~19 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=612ce881824ebb63c3cd1ecbc3b381ef70fb0fbf Merge remote-tracking branch 'dweismueller/owncloud-7' into next --- 612ce881824ebb63c3cd1ecbc3b381ef70fb0fbf