From: Magnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Date: Tue, 11 Nov 2014 11:49:22 +0000 (+0100)
Subject: merge
X-Git-Tag: oc-android-1.7.0_signed~69^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/437d3315e00d072ff72e23800947abeec2a0fee2?hp=437d3315e00d072ff72e23800947abeec2a0fee2

merge
---