[smuxi/experiments/gtk2_builder_pref_dialog: 15/25] Merge branch 'stable'

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit bd5845e37ad44b2eb960487f8fc167654f509a5b
Merge: ab440e0 0becb1d
Author: Mirco Bauer <meebey meebey net>
Date:   Sat May 28 14:19:01 2016 +0200

    Merge branch 'stable'

 src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs |   72 ++++++++++---------
 src/smuxi-win32.nsis.in                            |   32 +++++++++-
 2 files changed, 69 insertions(+), 35 deletions(-)
---