From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 9 Jul 2012 09:28:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into moresync
X-Git-Tag: oc-android-1.4.3~298
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cbf9ca8beac99dc06678d13c5f80804d56445472

Merge remote-tracking branch 'origin/master' into moresync
---

cbf9ca8beac99dc06678d13c5f80804d56445472