Merge 0.10->trunk

[prosody.git] / .hgignore

diff --git a/.hgignore b/.hgignore
index 48c5d030457297045b19112b153a6318537b357f..7937da24a01f68ddd7440f437033b278be5a0683 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ prosody.cfg.lua
 prosody.version
 config.unix
 *.patch
+*.diff
 *.orig
 *.rej
 *.save