[smuxi/experiments/tag_messages: 25/41] Merge branch 'stable'

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

commit 8fbc804563cfbd6ae473cbf1f19cc1136284a30c
Merge: 107a3e5 30c3ecc
Author: Mirco Bauer <meebey meebey net>
Date:   Fri Feb 5 19:00:39 2016 +0100

    Merge branch 'stable'

 Makefile.am                                        |   12 +---
 lib/Makefile.am                                    |   74 --------------------
 src/Common/Makefile.am                             |    2 +-
 src/Engine-Campfire/Makefile.am                    |    2 +-
 src/Engine-IRC/Makefile.am                         |    2 +-
 src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs |    2 +-
 src/Engine-JabbR/Makefile.am                       |    2 +-
 src/Engine-MessageBuffer/Makefile.am               |    2 +-
 src/Engine-Twitter/Makefile.am                     |    3 +-
 src/Engine-XMPP/Makefile.am                        |    2 +-
 src/Engine/Makefile.am                             |    2 +-
 src/Frontend-Curses/Makefile.am                    |    2 +-
 src/Frontend-GNOME-IRC/IrcGroupChatView.cs         |    2 +-
 src/Frontend-GNOME-IRC/Makefile.am                 |    2 +-
 src/Frontend-GNOME-Twitter/Makefile.am             |    2 +-
 src/Frontend-GNOME-XMPP/Makefile.am                |    2 +-
 src/Frontend-GNOME/Frontend.cs                     |    9 ++-
 src/Frontend-GNOME/Makefile.am                     |   14 ++--
 src/Frontend-STFL/Makefile.am                      |    2 +-
 src/Frontend-SWF/Makefile.am                       |    2 +-
 src/Frontend-Test/Makefile.am                      |    2 +-
 src/Frontend/Makefile.am                           |    2 +-
 src/Server/Makefile.am                             |    2 +-
 23 files changed, 35 insertions(+), 113 deletions(-)
---