From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 26 Jun 2013 16:13:11 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.3~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/67325ed36cae054c8980f84ed33c3921de293736?ds=inline;hp=-c

Merge branch 'master' into develop
---

67325ed36cae054c8980f84ed33c3921de293736