Mercurial > pidgin.yaz
diff pidgin/pidginstock.c @ 17168:c8ed8e351541
explicit merge of '751c46819c7edfd139753ceda847258389eee965'
and 'e39b5117f8df79ccfe2f383c3b0bbe8f33566991'
to branch 'im.pidgin.pidgin'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 19 May 2007 07:51:03 +0000 |
parents | d6ccf170148e |
children | 580c6c5d9480 |