[smuxi: 2/2] Merge branch 'stable'

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

commit a1f73065628c1b8e05a6d6eb76a29a8d563263bd
Merge: 9fe84de b05bf4c
Author: Mirco Bauer <meebey meebey net>
Date:   Sat Feb 14 20:20:45 2015 +0100

    Merge branch 'stable'

 src/Server/Main.cs        |   18 +++++++++++-------
 src/Server/smuxi-server.1 |    2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)
---