# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1289145780 0
# Node ID 9a35c7e2fee48df03526e572943e1f57893752cc
# Parent  e7296274f48c8d46d79ba463c062e261b0b22357# Parent  cda4855863afd2236a5ae68c33729130cd94dc79
Merge with Zash

diff -r cda4855863af -r 9a35c7e2fee4 mod_seclabels/mod_seclabels.lua
--- a/mod_seclabels/mod_seclabels.lua	Sun Oct 31 00:27:56 2010 +0200
+++ b/mod_seclabels/mod_seclabels.lua	Sun Nov 07 16:03:00 2010 +0000
@@ -5,6 +5,12 @@
 
 module:add_feature(xmlns_label);
 
+module:hook("account-disco-info", function(event)
+	local stanza = event.stanza;
+	stanza:tag('feature', {var=xmlns_label}):up();
+	stanza:tag('feature', {var=xmlns_label_catalog}):up();
+end);
+
 local labels = {
 	Classified = {
 		SECRET = { color = "black", bgcolor = "aqua", label = "THISISSECRET" };