Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
authormasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:17:55 +0000 (17:17 +0100)
committermasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:17:55 +0000 (17:17 +0100)
commit738ea33c060fdf1ebc30ae8cc952229bc59da979
tree7219ac9e734fd0db278e6a57edc5e3c4e7288c3c
parentd326d100edb80c91562c778bf41b29a47b80d9cf
parentf5a9c9600edc35f2e5e21d1751a09ff1241c0876
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync