From: jabarros <jabarros@solidgear.es>
Date: Fri, 21 Nov 2014 09:57:38 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.6.2
X-Git-Tag: oc-android-1.7.0_signed~15^2~5^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/803ed3487449d4b07ab8e38dc15e76ea96446c3e?ds=inline;hp=-c

Merge branch 'develop' into release-1.6.2
---

803ed3487449d4b07ab8e38dc15e76ea96446c3e