Merge branch 'AMQPChannelException' into gmf_rupture
Merged from hazard-curves-from-gmfs
Merge branch 'hazard-curves-from-gmfs' of github.com:gem/oq-engine into fast-export
Merge branch 'master' of github.com:gem/oq-engine into fast-export
Removed some annoying logic tree tests (they will be rewritten, see https://bugs.launchpad.net/oq-engine/+bug/1323916
Merge branch 'master' of github.com:gem/oq-engine into fast-export
Merge branch 'fast-export' of github.com:gem/oq-engine into fast-export
Fixed a couple of tests
Fixed a very subtle ordering bug in the event based calculator
Fixed logictree_test.py
Merge branch 'fast-export' into gmf_rupture
Fixed several tests
Changed get_imts to return the IMTs in order
Small improvement
Merge branch 'gmf_rupture' of github.com:gem/oq-engine into gmf_rupture