# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269094671 0
# Node ID 2b54ef7cec32d75f03997b8ba2d64bb513dc4313
# Parent  3e06b0f523630d11ef2d213a0aa3bbe45bae9fc7# Parent  b924d915c4d0a763b93ab9dfa5708143ba5404aa
Merge 0.7->trunk

diff -r 3e06b0f52363 -r 2b54ef7cec32 .hgignore
--- 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