# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1391680509 -3600
# Node ID a35c9e52b02e22f42610b48bcc81b16eaff0713e
# Parent  e6f735c62c5d27edc78409a34ddf07defa4f57da# Parent  fad7084a0b354b6b28eb606dd4bb7255253ad7b0
Merge 0.10->trunk

diff -r e6f735c62c5d -r a35c9e52b02e plugins/mod_motd.lua
--- a/plugins/mod_motd.lua	Mon Feb 03 07:25:05 2014 +0100
+++ b/plugins/mod_motd.lua	Thu Feb 06 10:55:09 2014 +0100
@@ -15,7 +15,7 @@
 
 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;