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

Merge branch 'develop' into setup_buttons
---