From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 14 Feb 2014 13:54:47 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~9^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fd0b92e9f2575b74d82e1748b009b94d3a520bec?ds=sidebyside

Merge branch 'develop' into release-1.5.4
---

fd0b92e9f2575b74d82e1748b009b94d3a520bec