[Merge] lp:dhis2 into lp:~dhis2-devs/dhis2/dhis2-chis

Review: Approve
Missed the conversation but sounds like a plan ...

···

--
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/6851
Your team DHIS 2 developers is subscribed to branch lp:dhis2.