diff po/ChangeLog @ 26837:ca2c3d134eaf

Fix a bad merge in 511953ddd75ccd866325fa6cf1e72dbb4fca3e82
author Paul Aurich <paul@darkrain42.org>
date Thu, 30 Apr 2009 02:59:24 +0000
parents 53bfa3d67739
children d99cc163a53f 7a3458436140
line wrap: on
line diff