From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 25 Jul 2014 06:45:39 +0000 (+0200)
Subject: Removed conflict mark
X-Git-Tag: oc-android-1.7.0_signed~245^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f5e3f97ef1591ebe1fc814f188aae5d69f6d7d55?hp=f5e3f97ef1591ebe1fc814f188aae5d69f6d7d55

Removed conflict mark
---