From: Daniel Weismüller <daniel.weismueller@ipfire.org>
Date: Wed, 4 Mar 2015 14:30:28 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x into owncloud-7.03
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fowncloud-7.03;p=people%2Fdweismueller%2Fipfire-2.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x into owncloud-7.03
---

0075ede05d457280f76ea69006985ec75459efc6