Mercurial > pidgin.yaz
diff NEWS @ 26849:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 6c18e5f5c034 |
children | c269f065b8af 021fbf2df9f0 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 6c18e5f5c034 |
children | c269f065b8af 021fbf2df9f0 |