From: Sam <odeh_sam@hotmail.com>
Date: Wed, 3 Dec 2014 09:04:39 +0000 (+0100)
Subject: Merged with owncloud develop
X-Git-Tag: oc-android-1.7.0_signed~69^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/382191d1f94c02475bdd607852e552b5621a7d9c?ds=inline;hp=--cc

Merged with owncloud develop
---

382191d1f94c02475bdd607852e552b5621a7d9c