Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 20 Mar 2014 16:48:23 +0000 (17:48 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 20 Mar 2014 16:48:23 +0000 (17:48 +0100)
commit4f4c6843a7d8c160def6030e49ccef2083158c49
tree0cf0e8d00c2a211caa0ee84c3cb978ac196d5f07
parent4ab61cf5ec6a3de759471d8375482c3452200107
parent4d3661299ba2f13e0451fb2875a8bee2ad688fdf
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync