Mercurial > pidgin
diff COPYRIGHT @ 31718:f2a3c59fc4a6
Fix up merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | b2f6fec7b98e |
children | eeb3a2f7f587 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | b2f6fec7b98e |
children | eeb3a2f7f587 |