From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 10 Feb 2014 13:46:26 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~9^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/28ef1bcf62b779fafb35a08abd8b355d180436db?hp=-c

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

28ef1bcf62b779fafb35a08abd8b355d180436db