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)

Trivial merge