Merge branch 'develop' into fix_refresh_account_lollipop
authorRaquel <rperez@solidgear.es>
Wed, 19 Nov 2014 08:31:19 +0000 (09:31 +0100)
committerRaquel <rperez@solidgear.es>
Wed, 19 Nov 2014 08:31:19 +0000 (09:31 +0100)

Trivial merge