From: David A. Velasco <dvelasco@owncloud.com>
Date: Fri, 12 Sep 2014 11:01:27 +0000 (+0200)
Subject: Merge pull request #620 from LukeOwncloud/develop
X-Git-Tag: oc-android-1.7.0_signed~188
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/340bbd0d8715fc540b079fd9f0a547813974e388?hp=28550f5c68b2439b0390785e8c3d5b42d3ed91c8

Merge pull request #620 from LukeOwncloud/develop

Fix mvn build
---