From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 18 Sep 2014 07:31:24 +0000 (+0200)
Subject: Fixed conflict - Merge branch 'develop' into better_loggin_system
X-Git-Tag: oc-android-1.7.0_signed~176^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea5c4760c2f150f907b17c2c8609ab1353a3ef62?hp=ea5c4760c2f150f907b17c2c8609ab1353a3ef62

Fixed conflict - Merge branch 'develop' into better_loggin_system
---