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

Trivial merge