[smuxi: 3/4] Merge branch 'stable'

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

commit e09a642fbfc3c94496c7c9424a2971d1021e401b
Merge: d10feaf 158083f
Author: Mirco Bauer <meebey meebey net>
Date:   Tue Jun 16 13:00:27 2015 +0200

    Merge branch 'stable'

 po-Engine-Campfire/Makefile.in.in        |   39 ++++++++++++++++-------------
 po-Engine-IRC/Makefile.in.in             |   39 ++++++++++++++++-------------
 po-Engine-JabbR/Makefile.in.in           |   39 ++++++++++++++++-------------
 po-Engine-Twitter/Makefile.in.in         |   39 ++++++++++++++++-------------
 po-Engine-XMPP/Makefile.in.in            |   39 ++++++++++++++++-------------
 po-Engine/Makefile.in.in                 |   39 ++++++++++++++++-------------
 po-Frontend-GNOME-IRC/Makefile.in.in     |   39 ++++++++++++++++-------------
 po-Frontend-GNOME-Twitter/Makefile.in.in |   39 ++++++++++++++++-------------
 po-Frontend-GNOME-XMPP/Makefile.in.in    |   39 ++++++++++++++++-------------
 po-Frontend-GNOME/Makefile.in.in         |   39 ++++++++++++++++-------------
 po-Frontend/Makefile.in.in               |   39 ++++++++++++++++-------------
 po-Server/Makefile.in.in                 |   39 ++++++++++++++++-------------
 po/Makefile.in.in                        |   26 +++++++++++--------
 13 files changed, 267 insertions(+), 227 deletions(-)
---