Mercurial > pidgin
changeset 29634:f19ee75947c6
merge of '7e1e376dfb1d794f80c1f29679e3e899208bd856'
and 'd1dbbf85441c66810b725eac8586af7febb33118'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 23 Mar 2010 23:25:14 +0000 |
parents | 1bde873d1b94 (current diff) a1b4795104eb (diff) |
children | 33a4d72232a7 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff