# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1391680121 -3600
# Node ID fad7084a0b354b6b28eb606dd4bb7255253ad7b0
# Parent  ff24bc2d41a6203ab0421b5fba3a130dc5a84549# Parent  1579b53351e240eb01a1cabc46939093e9da76f9
Merge 0.9->0.10

diff -r ff24bc2d41a6 -r fad7084a0b35 plugins/mod_motd.lua
--- a/plugins/mod_motd.lua	Mon Feb 03 07:23:33 2014 +0100
+++ b/plugins/mod_motd.lua	Thu Feb 06 10:48:41 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;