# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1343238709 -3600
# Node ID 28498f29fdd829d9dcfa389fb6fd905c2ef0caf8
# Parent  047f6621e70923280e912646c0d66631e94528a3# Parent  76f957b44cf72efdf7a0901e835c5106a1df5190
Merge with Zash

diff -r 76f957b44cf7 -r 28498f29fdd8 plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Tue Jul 24 22:03:51 2012 +0200
+++ b/plugins/mod_pep.lua	Wed Jul 25 18:51:49 2012 +0100
@@ -32,7 +32,7 @@
 	hash_map = state.hash_map or {};
 end
 
-module:add_identity("pubsub", "pep", "Prosody");
+module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));
 module:add_feature("http://jabber.org/protocol/pubsub#publish");
 
 local function subscription_presence(user_bare, recipient)