From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 09:16:31 +0000 (+0200)
Subject: Add comment removed when fixing conflict in merge
X-Git-Tag: oc-android-1.7.0_signed~134^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/583194a19a8360ac06c5ed1af6ec362b3228be84?hp=583194a19a8360ac06c5ed1af6ec362b3228be84

Add comment removed when fixing conflict in merge
---