# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1375586044 18000
# Node ID afb17af7948ff306c05814ea0a32f4929a795931
# Parent  6e6492468bb863fb58e54790975d9b93c193aad4# Parent  2af10c2cec215984e7875c3da9e16fbfeb6947f7
Merge.

diff -r 6e6492468bb8 -r afb17af7948f .hgignore
--- a/.hgignore	Sat Aug 03 22:12:03 2013 -0500
+++ b/.hgignore	Sat Aug 03 22:14:04 2013 -0500
@@ -1,5 +1,7 @@
 syntax: glob
 *.log
+*.log.?
+*.log.?.gz
 *.pyc
 *.swp
 secrets.json