From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 11 Dec 2013 07:52:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: oc-android-1.5.5~109
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/61a12ae15f0d2ad008bb16fba68f8dc22630a389?hp=-c

Merge remote-tracking branch 'origin/develop' into develop
---

61a12ae15f0d2ad008bb16fba68f8dc22630a389