From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 4 Dec 2013 11:09:22 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~112
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/34923cf74ba9a09e10276bc919f05ddadc7ab6f7?ds=inline

Merge branch 'master' into develop
---

34923cf74ba9a09e10276bc919f05ddadc7ab6f7