From: masensio <masensio@solidgear.es>
Date: Mon, 17 Feb 2014 12:03:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/55e2a45ab8721c9b64274bc182f72a5666d671de

Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4
---

55e2a45ab8721c9b64274bc182f72a5666d671de