From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 24 Jul 2014 07:30:11 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~248
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9953a942ea1f8f6e02cdd3f600f894228dfc344f

Merge branch 'master' into develop
---

9953a942ea1f8f6e02cdd3f600f894228dfc344f