AIFDR/inasafe — pull request #1280 by timlinux (2014-10-20 08:39:26+00:00)
Title: Test fixes

Not ready for merge yet