Merge branch 'develop' into save_position_in_scroll_when_browsing
authormasensio <masensio@solidgear.es>
Wed, 9 Apr 2014 08:11:54 +0000 (10:11 +0200)
committermasensio <masensio@solidgear.es>
Wed, 9 Apr 2014 08:11:54 +0000 (10:11 +0200)

Trivial merge