OCHA-DAP/hdx-ckan — pull request #565 by mbellotti (2014-06-18 05:49:27+00:00)
Title: closes #544 closes #513

This is a little jacked up because I'm switching between the ckan2-2 branch and marianne-dev :/