From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Jun 2014 13:13:09 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~295
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0a1447e866377773af2661ffdd0affb73e71547e?ds=inline

Merge branch 'master' into develop
---

0a1447e866377773af2661ffdd0affb73e71547e