Merge 0.9->0.10

diff --combined plugins/mod_motd.lua
index 1e2ee395af1c98d6282759d85a638c6103b5906c,3dd6b8168aefbacc7e28eacf705183a9cb36df57..574a9cf408e6fe883c801ae65d6a35d5e3485e1b
--- 1/plugins/mod_motd.lua
--- 2/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@@ -2,7 -2,7 +2,7 @@@
  -- Copyright (C) 2008-2010 Matthew Wild
  -- Copyright (C) 2008-2010 Waqas Hussain
  -- Copyright (C) 2010 Jeff Mitchell
 --- 
 +--
  -- This project is MIT/X11 licensed. Please see the
  -- COPYING file in the source package for more information.
  --
@@@ -15,7 -15,7 +15,7 @@@ if not motd_text then return; en
  
  local st = require "util.stanza";
  
- motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config
+ motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Strip indentation from the config
  
  module:hook("presence/bare", function (event)
                local session, stanza = event.origin, event.stanza;