# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247587783 -3600
# Node ID 0461fb35f2ac9c154d1903bd3be6efe49204c498
# Parent  30c548e1d517c5a00cf0ca583edc40b4633533a7# Parent  b88b30c9e688632b1bb7e5e5ea1d7ba1562a1cc9
Merge with 0.5

diff -r 30c548e1d517 -r 0461fb35f2ac prosody.cfg.lua.dist
--- a/prosody.cfg.lua.dist	Mon Jul 13 21:18:43 2009 +0100
+++ b/prosody.cfg.lua.dist	Tue Jul 14 17:09:43 2009 +0100
@@ -52,6 +52,7 @@
 			  	"uptime"; -- Report how long server has been running
 			  	"time"; -- Let others know the time here on this server
 			  	"ping"; -- Replies to XMPP pings with pongs
+			  	"pep"; -- Enables users to publish their mood, activity, playing music and more
 				"register"; -- Allow users to register on this server using a client and change passwords
 
 			-- Other specific functionality