I changed the format of CHANGELOG.txt to reflect the status of stable and trunk at the same time. Unfortunately, this doesn't display too well with html.
Regards,Andreas