merge of '77693555855fe9cd3215414f79964dba346cc5fa' gaim

merge of 'b98e72d4089afb8a1879e5fe9627cfb132ee88de' gaim

Sun apparently doesn't like when void functions return

sf patch #1644019, from good ol' Ka-Hing Cheung

Show "(experimental)" next to the enable-mono option

sf patch #1639901, from Saleem Abdulrasool

Add line breaks to Evan's NEWS entry

sf patch #1640011, from Celso Pinto

Allow localization of the xmpp console plugin

Mark didn't read the comment above the line he changed. ;-)

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial