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)
commit0c4adf5134ef12dff149c6e7bf03be4c7e15b8db
tree53771469a21b2cafbc741530bbba0610e06fb215
parentb884276998a4d78b5eedfe657c91a4753434b6b9
parent68d4c74fdaba1dcbf135b4b84adfd7def15f2730
Merge branch 'develop' into fix_loading_dialog_crash