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)

Trivial merge