propagate from branch 'im.pidgin.pidgin' (head 75266af2c12b1e3e57274805b2a33ffc9069f4a1) cpw.malu.xmpp.attention

propagate from branch 'im.pidgin.pidgin' (head f5b06eefd07ff019cdf873e3b6e811ceb8c0eafe) cpw.malu.xmpp.attention

Manual merge cpw.attention_ui

Manual merge cpw.attention_ui

propagate from branch 'im.pidgin.pidgin' (head 7f727648981a87fbfe0bb86df243f3326d24239b) cpw.attention_ui

This time it should be alright... cpw.attention_ui

propagate from branch 'im.pidgin.pidgin' (head 0ca56c346a33015d3aaca38a60b0864c080bf3dc) cpw.attention_ui

Merge cpw.attention_ui

A little manual merge... cpw.attention_ui

propagate from branch 'im.pidgin.pidgin' (head 07c6dacadf88be13c6beedeb1f658807a86f46d2) cpw.attention_ui

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

mercurial