Merge branch 'develop' into fix_loading_dialog_crash
authormasensio <masensio@solidgear.es>
Mon, 23 Sep 2013 07:06:37 +0000 (09:06 +0200)
committermasensio <masensio@solidgear.es>
Mon, 23 Sep 2013 07:06:37 +0000 (09:06 +0200)

Trivial merge