Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
authormasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:43:34 +0000 (14:43 +0100)
committermasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:43:34 +0000 (14:43 +0100)
commit0d2c764638508f696b0e3a76aa936a9279d9f5c6
tree64b04f0d4dd2db545a3c26519710256007983f82
parentd150299b1c50ada0e03a13940665d6c491367e45
parentb124167f50c69bb98c1456f48ec9fcfab4bd63c1
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync