From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 11 Jan 2013 17:44:47 +0000 (+0100)
Subject: Merge branch 'master' into crash_fixes
X-Git-Tag: oc-android-1.4.3~68
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7f881d17121a69d3ee4dacc6d50d464c0ad9db04?hp=--cc

Merge branch 'master' into crash_fixes
---

7f881d17121a69d3ee4dacc6d50d464c0ad9db04