From: Magnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Date: Mon, 20 Oct 2014 12:38:13 +0000 (+0200)
Subject: Merge with develop
X-Git-Tag: oc-android-1.7.0_signed~119^2~2^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/844790057b6519bc6e90f49c139335a97aade4c8?hp=844790057b6519bc6e90f49c139335a97aade4c8

Merge with develop
---