Merge with 0.5

Tue, 14 Jul 2009 17:09:43 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 14 Jul 2009 17:09:43 +0100
changeset 1549
0461fb35f2ac
parent 1547
30c548e1d517 (current diff)
parent 1548
b88b30c9e688 (diff)
child 1553
5e7b1d4ee655

Merge with 0.5

--- 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

mercurial