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

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

commit 7ae274ff344947397eaa9d81cdbdc25243ad0830
Merge: 4ea1b4e 465b68f
Author: Mirco Bauer <meebey meebey net>
Date:   Sat Jan 31 00:31:31 2015 +0100

    Merge branch 'stable'
    
    Conflicts:
        lib/Twitterizer
        src/Engine-Tests/MessageBuilderTests.cs

 src/Engine-Tests/MessageBuilderTests.cs            |    6 ++++++
 .../Protocols/Xmpp/XmppProtocolManager.cs          |   13 -------------
 src/Engine/Config/MessageBuilderSettings.cs        |    2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --cc src/Engine-Tests/MessageBuilderTests.cs
index 094cd51,354f6a5..9400a53
--- a/src/Engine-Tests/MessageBuilderTests.cs
+++ b/src/Engine-Tests/MessageBuilderTests.cs
@@@ -560,11 -560,11 +560,17 @@@ namespace Smuxi.Engin
              builder.Append(new 
UrlMessagePartModel("https://web.archive.org/web/20050208144213/http://www.jaganelli.de/";));
              TestMessage(msg, builder.ToMessage());
  
 +            msg = "irc://freenode/smuxi";
 +            builder = new MessageBuilder();
 +            builder.TimeStamp = DateTime.MinValue;
 +            builder.Append(new UrlMessagePartModel(msg));
 +            TestMessage(msg, builder.ToMessage());
++
+             msg = "http://www.test.de/bilder.html?data[meta_id]=13895&data[bild_id]=7";;
+             builder = new MessageBuilder();
+             builder.TimeStamp = DateTime.MinValue;
+             builder.Append(new 
UrlMessagePartModel("http://www.test.de/bilder.html?data[meta_id]=13895&data[bild_id]=7";));
+             TestMessage(msg, builder.ToMessage());
          }
  
          [Test]