From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 7 Feb 2014 11:04:02 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ffa7b517841f927c385a02552a2de6a41d62ec79?hp=ffa7b517841f927c385a02552a2de6a41d62ec79

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