Mercurial > pidgin
diff m4macros/purple.m4 @ 29276:a0668fbf2483
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 402236ee7981 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 402236ee7981 |
children |