From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 23 Nov 2012 09:25:06 +0000 (+0100)
Subject: Merge of master after sync_review was merged into it
X-Git-Tag: oc-android-1.4.3~88^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4c50eb4d2dd1fba177d743315ae52223430db8cb?ds=inline;hp=4c50eb4d2dd1fba177d743315ae52223430db8cb

Merge ... master after sync_review was merged into it
---