commit | 44af232c837312900f7d5c0ad58c2d52cdc8aa8f | [log] [tgz] |
---|---|---|
author | Daniel Veillard <veillard@redhat.com> | Thu Jul 09 09:02:11 2009 +0200 |
committer | Daniel Veillard <veillard@redhat.com> | Thu Jul 09 09:02:11 2009 +0200 |
tree | a74f4e85e151cbe6ef91464ed646c816797d8ae6 | |
parent | 4ab6755755686fc8298abc6eed2c5e3d590e5e33 [diff] | |
parent | 798743a4983d3a2c94d6af1608bce9696aa181e7 [diff] |
Fix ChangeLog merge conflict