Merge branch 'develop' into save_position_in_scroll_when_browsing
authormasensio <masensio@solidgear.es>
Thu, 10 Apr 2014 07:01:52 +0000 (09:01 +0200)
committermasensio <masensio@solidgear.es>
Thu, 10 Apr 2014 07:01:52 +0000 (09:01 +0200)

Trivial merge