From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 12 Dec 2013 11:56:36 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~106
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ba8ee979d0bf5b821ab1241706cd1f15272dccd1

Merge branch 'master' into develop
---

ba8ee979d0bf5b821ab1241706cd1f15272dccd1