Merge commit 'cbb35cca'
[projects/chimara/chimara.git] / ChangeLog
1 (to do before release)