From: David A. Velasco <dvelasco@solidgear.es>
Date: Sat, 17 Aug 2013 08:52:03 +0000 (+0200)
Subject: Merge branch 'develop' into sso_bug_changing_orientation
X-Git-Tag: oc-android-1.4.6~18^2~8^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/54679a521d5126d586969c234e6f1536f27dae81?hp=--cc

Merge branch 'develop' into sso_bug_changing_orientation
---

54679a521d5126d586969c234e6f1536f27dae81