From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 1 Aug 2013 16:05:54 +0000 (+0200)
Subject: Merge branch 'master' into release-1.4.4
X-Git-Tag: oc-android-1.4.6~25^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c44ab769b47db4121bec51e512d8ef83665ab3db?ds=inline

Merge branch 'master' into release-1.4.4
---

c44ab769b47db4121bec51e512d8ef83665ab3db