From: masensio <masensio@solidgear.es>
Date: Fri, 11 Oct 2013 12:54:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
X-Git-Tag: oc-android-1.4.6~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2694ac00c69de87628ba589b2148b326c5526f80

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

2694ac00c69de87628ba589b2148b326c5526f80