diff pidgin.apspec.in @ 31719:e0856c50cdd8

Fix the merge some more I don't know whether this was me, kdiff3, or monotone on something.
author Paul Aurich <paul@darkrain42.org>
date Sun, 26 Jun 2011 20:37:03 +0000
parents 56042b2f8b64
children
line wrap: on
line diff