[smuxi: 121/179] Merge branch 'master' into experiments/gtk2_builder_pref_dialog

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

commit 8eaf65641d6938a9c106c3875563f343b9d5145e
Merge: b4e0883 7c17ff4
Author: Mirco Bauer <meebey meebey net>
Date:   Thu Jan 5 23:17:31 2017 +0100

    Merge branch 'master' into experiments/gtk2_builder_pref_dialog

 .travis.yml                                        |   14 +++++-
 Makefile.am                                        |    5 ++
 build/git-contributors                             |    1 +
 docker/release/Dockerfile                          |   47 +++++++++-----------
 docker/release/creds.conf                          |    2 -
 docker/release/start.sh                            |   22 +++------
 lib/SmartIrc4net                                   |    2 +-
 po-Frontend-GNOME/en_GB.po                         |    2 +-
 src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs |   13 +++---
 src/Engine-Tests/JsonMessageBufferTests.cs         |   37 +++++++++++++++
 src/Engine-Tests/MessageBufferTestsBase.cs         |   10 ++--
 src/Engine-Tests/MessageBuilderTests.cs            |   30 ++++++++++---
 src/Engine-Tests/SqliteMessageBufferTests.cs       |   16 +++++++
 .../Protocols/Twitter/TwitterProtocolManager.cs    |   18 ++++----
 src/Engine/Config/MessageBuilderSettings.cs        |    7 ++-
 src/Engine/Engine.csproj                           |    1 +
 src/Engine/Makefile.am                             |    3 +-
 src/Engine/MessageBuffers/SqliteMessageBuffer.cs   |    4 +-
 src/Engine/Messages/Dto/MessageDtoModelV1.cs       |    2 +-
 src/Engine/Messages/Dto/MessageDtoModelV2.cs       |   43 ++++++++++++++++++
 src/Engine/Messages/MessageBuilder.cs              |   29 ++++++++++---
 src/Engine/Persons/ContactModel.cs                 |   14 ------
 src/Engine/Session.cs                              |    1 -
 src/Frontend-Curses/Frontend.cs                    |    2 -
 src/Frontend-Curses/LogWidget.cs                   |    3 +-
 src/Frontend-GNOME/Frontend.cs                     |   28 +++++++++++-
 .../Views/Assistants/Engine/EngineAssistant.cs     |   27 +++++++++++-
 .../Engine/EngineAssistantCredentialsWidget.cs     |    6 +++
 src/Frontend-GNOME/Views/MenuWidget.cs             |    4 +-
 ...ntend.Gnome.EngineAssistantCredentialsWidget.cs |   20 +++++----
 src/Frontend-GNOME/gtk-gui/gui.stetic              |    2 +-
 .../smuxi-frontend-gnome.appdata.xml.in            |    7 +++-
 src/Frontend-SWF/Chats/ChatView.cs                 |    2 -
 src/Frontend-SWF/Entry.cs                          |    6 +-
 src/Frontend-SWF/Frontend.cs                       |    5 +--
 src/Frontend-SWF/MainWindow.cs                     |    3 +-
 src/Frontend-SWF/SwfUI.cs                          |    7 ---
 src/Frontend/CommandManager.cs                     |    5 ++-
 src/smuxi-win32.nsis.in                            |    1 +
 39 files changed, 314 insertions(+), 137 deletions(-)
---