From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 6 Nov 2013 09:36:34 +0000 (+0100)
Subject: Merge branch 'develop' into setup_buttons
X-Git-Tag: oc-android-1.5.5~139^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d252a09f53999a90036048d4db33c8b4f2f04c4f?hp=d252a09f53999a90036048d4db33c8b4f2f04c4f

Merge branch 'develop' into setup_buttons
---