Sat, 20 Mar 2010 14:17:51 +0000
Merge 0.7->trunk
--- a/.hgignore Thu Mar 18 10:11:11 2010 +0000 +++ b/.hgignore Sat Mar 20 14:17:51 2010 +0000 @@ -6,6 +6,7 @@ html/* prosody.lua prosody.cfg.lua +prosody.version config.unix *.patch *.orig