Merge branch 'develop' into pull_down_refresh
authormasensio <masensio@solidgear.es>
Fri, 30 May 2014 06:35:19 +0000 (08:35 +0200)
committermasensio <masensio@solidgear.es>
Fri, 30 May 2014 06:35:19 +0000 (08:35 +0200)

Trivial merge