AIFDR/inasafe — pull request #871 by akbargumbira (2014-03-07 10:09:36+00:00)
Title: Merge akbargumbira:master to AIFDR:master

Note: akbargumbira:master is identical with AIFDR:develop