Merge branch 'develop' into save_position_in_scroll_when_browsing
authormasensio <masensio@solidgear.es>
Mon, 7 Apr 2014 06:58:42 +0000 (08:58 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Apr 2014 06:58:42 +0000 (08:58 +0200)

Trivial merge