diff etc/ChangeLog @ 106394:51d4bdf757c8

Correct conflicts in previous patch.
author Alan Mackenzie <acm@muc.de>
date Thu, 03 Dec 2009 15:56:29 +0000
parents 005b1f5cc6c8
children b5f38c883bf8
line wrap: on
line diff