From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 26 Jun 2013 16:13:05 +0000 (+0200)
Subject: Merge branch 'release-1.4.1' into develop
X-Git-Tag: oc-android-1.4.3~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66a005416cb7752eb197413e155afe38a0ed5780?ds=inline;hp=-c

Merge branch 'release-1.4.1' into develop
---

66a005416cb7752eb197413e155afe38a0ed5780