From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 5 Jul 2013 07:22:52 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.3~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/04c2311131508ed1c34f5a53d1016b04814dcdd8

Merge branch 'master' into develop
---

04c2311131508ed1c34f5a53d1016b04814dcdd8