Mercurial > lxmppd-hg-xmllex / changeset

• changeset
• raw
• zip
• gz

changeset

Merge 0.7->trunk

Sat, 20 Mar 2010 14:17:51 +0000

author

Matthew Wild <mwild1@gmail.com>

date

Sat, 20 Mar 2010 14:17:51 +0000

changeset 2906

2b54ef7cec32

parent 2904

3e06b0f52363 (current diff)

parent 2905

b924d915c4d0 (diff)

child 2907

767864297afe

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