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)

Trivial merge