From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 16 Jul 2012 11:04:38 +0000 (+0200)
Subject: Merge branch 'testing_cancel_sync'
X-Git-Tag: oc-android-1.4.3~272
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/424164206f616fab373db9261b0213ba7d1d7ce8

Merge branch 'testing_cancel_sync'
---

424164206f616fab373db9261b0213ba7d1d7ce8