Merge branch 'testing_cancel_sync'
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 16 Jul 2012 11:04:38 +0000 (13:04 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 16 Jul 2012 11:04:38 +0000 (13:04 +0200)
commit424164206f616fab373db9261b0213ba7d1d7ce8
treed2778105bb9f571865479d323f9ccd137b3f22e0
parent4f2f33c9bcfce7fb96c149f8e50188372a3ec61b
parent0f2376806f4ed54291ef29d6ebd9f76f736a0da5
Merge branch 'testing_cancel_sync'