From: zerginator <thorstenvomsee@gmx.de>
Date: Sun, 28 Apr 2013 09:40:40 +0000 (+0200)
Subject: Merge branch 'develop' into fixForCrashedSharedContents
X-Git-Tag: oc-android-1.4.3~28^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e0ce2d4d5c6eea8bf7801e8f1e3960943bc54017

Merge branch 'develop' into fixForCrashedSharedContents
---

e0ce2d4d5c6eea8bf7801e8f1e3960943bc54017