From: jabarros <jabarros@solidgear.es>
Date: Fri, 26 Dec 2014 10:10:22 +0000 (+0100)
Subject: Merge branch 'develop' into obeySortOrder_fixmerge
X-Git-Tag: oc-android-1.7.0_signed~47^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4257aa1d9c53facbd1b59cc037b14dadeec5d2f2?hp=4257aa1d9c53facbd1b59cc037b14dadeec5d2f2

Merge branch 'develop' into obeySortOrder_fixmerge
---