From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 10 Jul 2013 07:06:08 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.3~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/133e89d49559be9ead2449c2bdc7cd38ec23a71b?ds=inline;hp=-c

Merge branch 'master' into develop
---

133e89d49559be9ead2449c2bdc7cd38ec23a71b