my changelog was in conflict, resolving this
authorMicah Anderson <micah@riseup.net>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)
committerMicah Anderson <micah@riseup.net>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)
commit0f46b775b9ef027abe15a974395d111a83f29ef3
tree86428783c4a5a0fa3ccd4e1811b837af21126f8e
parent42b7be6130c2e4ebc29ea87647aa80a34c596215
my changelog was in conflict, resolving this
ChangeLog