From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Oct 2013 10:59:57 +0000 (+0200)
Subject: Merge branch 'develop' into fixed_permanent_redirections
X-Git-Tag: oc-android-1.4.6^2~1^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dad222191608dd903e7247615fe9abc1b6c74e39?ds=inline

Merge branch 'develop' into fixed_permanent_redirections
---

dad222191608dd903e7247615fe9abc1b6c74e39