From: masensio <masensio@solidgear.es>
Date: Fri, 13 Mar 2015 09:12:27 +0000 (+0100)
Subject: Merge branch 'develop' into fix_crash_in_android_2
X-Git-Tag: oc-android-1.7.1_signed^2~19^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8fa5936eb04ebf9bb06e3dac6e21983c55a96fbc?ds=inline;hp=--cc

Merge branch 'develop' into fix_crash_in_android_2
---

8fa5936eb04ebf9bb06e3dac6e21983c55a96fbc