From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 12 Dec 2013 13:36:33 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~105
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/269cba91baab777791e0663b8c9eb53cb4b32873?ds=inline;hp=-c

Merge branch 'master' into develop
---

269cba91baab777791e0663b8c9eb53cb4b32873