[smuxi/experiments/configurable_message_patterns: 5/6] Merge branch 'stable' into experiments/configurable_message_patterns

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

commit c44fcef83c8bff32c6b0990911cb5dca84c1ebe0
Merge: 259c105 8aebf01
Author: Mirco Bauer <meebey meebey net>
Date:   Sun Feb 16 19:09:41 2014 +0100

    Merge branch 'stable' into experiments/configurable_message_patterns
    
    Conflicts:
        src/Frontend/CommandManager.cs

 src/Frontend/CommandManager.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc src/Frontend/CommandManager.cs
index 75bbc9c,9bf7306..1aa946b
--- a/src/Frontend/CommandManager.cs
+++ b/src/Frontend/CommandManager.cs
@@@ -135,10 -145,8 +146,12 @@@ namespace Smuxi.Fronten
                          CommandEcho(cmd);
                          handled = true;
                          break;
 +                    case "benchmark_message_builder":
 +                        CommandBenchmarkMessageBuilder(cmd);
 +                        handled = true;
 +                        break;
+                     case "exception":
+                         throw new Exception("You asked for it.");
                  }
              }
              if (handled) {