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)
commit4811eb4f5784f37cb1fa9c8986ad5145716136bc
treeb41deddf90cac11d2e17807ec4ec333a75161a8a
parent0c4adf5134ef12dff149c6e7bf03be4c7e15b8db
parentab6b82750e2f99dad49c99de913dd0f208fda244
Merge branch 'develop' into fix_loading_dialog_crash