From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 24 Mar 2014 09:23:05 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.5
X-Git-Tag: oc-android-1.5.5~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d2ff7d47553944206bcb904b423fa33b91ef0977?ds=sidebyside;hp=d2ff7d47553944206bcb904b423fa33b91ef0977

Merge branch 'develop' into release-1.5.5
---