Hi,
I have created a release branch for 2.0.4 here:
https://code.launchpad.net/~dhis2-devs-core/dhis2/2.0.4
This means that new functionality can be developed in trunk. If you commit bug fixes either do it in the release branch and merge it into trunk, or specify bug fix in the commit message and I will take care of it.
Lars