Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authormasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:29:18 +0000 (14:29 +0200)
committermasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:29:18 +0000 (14:29 +0200)

Trivial merge