From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 2 Jul 2013 11:08:27 +0000 (+0200)
Subject: Merge branch 'develop' into modify_password
X-Git-Tag: oc-android-1.4.3~10^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8239f434aeb23f598080033ec5f15e0b1971f31?hp=e8239f434aeb23f598080033ec5f15e0b1971f31

Merge branch 'develop' into modify_password
---