From: jabarros <jabarros@solidgear.es>
Date: Thu, 2 Oct 2014 07:04:11 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.6.0
X-Git-Tag: oc-android-1.7.0_signed~15^2~28
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2e472998c16e504c0c2ceddf7de52a000d7bd7f8

Merge branch 'develop' into release-1.6.0
---

2e472998c16e504c0c2ceddf7de52a000d7bd7f8