From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 18 Nov 2013 07:53:48 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~128
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6ef1a604ec4b15522ae390d1a54cc658883ed764?hp=-c

Merge branch 'master' into develop
---

6ef1a604ec4b15522ae390d1a54cc658883ed764