Prevent failing if qgis.core is not available
Merge upstream and merge in custom_logging.py to handle the two exception types
Fix PYTHONPATH for make-list-shakes.sh
InaSafe Realtime: Add function to create index.html from pickle containing shakemap metadata
Fix header and footer location for index.html(list of report)
Need to be fixed, glob doesn't search subfolders
#683 Aggregation Template - first draft of basic dialog for merging impact summary from two layers.
#683 Aggregation Template - first draft of basic test for impact function dialog.
#683 Aggregation Template - minor updates - added first test dataset.
#701 Aggregation fails with flood impact on people - fix by stripping of thousands separator from numbers. Mbernasocci please review.
Added Akbar to the AUTHORS file.
remove Total in aggregation areas when aoi_mode is active
gracefully recover from #698
better fix for #701 by using unhumanize.
closes #701
Tidy Up
fix rst doc compile error
changed utilities call to use safe_qgis package name
Merge branch 'master' of github.com:AIFDR/inasafe
Remove reference to impact function merge dialog from inasafe-683 branch
Merge pull request #679 from vdeparday/master

Prevent failing if qgis.core is not available