Changeset

2906:2b54ef7cec32

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 20 Mar 2010 14:17:51 +0000
parents 2904:3e06b0f52363 (current diff) 2905:b924d915c4d0 (diff)
children 2907:767864297afe
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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