[Pkg-cli-apps-commits] [smuxi] 02/03: Merge tag 'upstream/0.11_rc5'

[Mirco Bauer]

This is an automated email from the git hooks/post-receive script.

meebey pushed a commit to branch master
in repository smuxi.

commit 21570a2acc3f3741f2ee797fa1c720c032c8020e
Merge: efdedf6 2900227
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Mar 16 17:05:20 2014 +0100

    Merge tag 'upstream/0.11_rc5'
    
    Upstream version 0.11~rc5

 aclocal.m4                                      |    3 +-
 configure                                       |    1 +
 ltmain.sh                                       |    4 +-
 po-Engine-Campfire/LINGUAS                      |    1 +
 po-Engine-Campfire/nl.po                        |   89 ++
 po-Engine-IRC/LINGUAS                           |    1 +
 po-Engine-IRC/nl.po                             |  370 +++++++
 po-Engine-JabbR/LINGUAS                         |    1 +
 po-Engine-JabbR/nl.po                           |   57 ++
 po-Engine-Twitter/LINGUAS                       |    1 +
 po-Engine-Twitter/nl.po                         |  186 ++++
 po-Engine-XMPP/LINGUAS                          |    1 +
 po-Engine-XMPP/nl.po                            |  293 ++++++
 po-Engine/LINGUAS                               |    1 +
 po-Engine/nl.po                                 |  273 +++++
 po-Frontend-GNOME-IRC/LINGUAS                   |    1 +
 po-Frontend-GNOME-IRC/nl.po                     |   90 ++
 po-Frontend-GNOME-Twitter/LINGUAS               |    1 +
 po-Frontend-GNOME-Twitter/nl.po                 |   35 +
 po-Frontend-GNOME-XMPP/LINGUAS                  |    1 +
 po-Frontend-GNOME-XMPP/nl.po                    |   42 +
 po-Frontend-GNOME/LINGUAS                       |    1 +
 po-Frontend-GNOME/nl.po                         | 1224 +++++++++++++++++++++++
 po-Frontend/LINGUAS                             |    1 +
 po-Frontend/nl.po                               |  119 +++
 po-Server/LINGUAS                               |    1 +
 po-Server/nl.po                                 |  133 +++
 src/Common/Defines.cs                           |    6 +-
 src/Engine-JabbR/JabbrProtocolManager.cs        |   14 +
 src/Engine/Config/MessageBuilderSettings.cs     |   30 +-
 src/Engine/MessageBuffers/Db4oMessageBuffer.cs  |    4 +-
 src/Engine/Session.cs                           |   65 +-
 src/Engine/SessionManager.cs                    |    2 +-
 src/Frontend-GNOME/Frontend.cs                  |   13 +-
 src/Frontend-GNOME/Makefile.am                  |    1 +
 src/Frontend-GNOME/Makefile.in                  |    1 +
 src/Frontend-GNOME/smuxi-frontend-gnome.desktop |    4 +
 src/Frontend-STFL/Frontend.cs                   |   20 +-
 src/Frontend-STFL/Main.cs                       |   23 +
 src/Frontend-STFL/smuxi-frontend-stfl.1         |    4 +-
 src/Server/smuxi-server.1                       |    9 +-
 41 files changed, 3078 insertions(+), 49 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/smuxi.git