akvo/akvo-rsr — pull request #962 by adriancollier (2014-12-15 13:19:05+00:00)
Title: Merge Release/candidate back into develop

Should have been done since the 2.5 release