# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1346344562 -7200
# Node ID 142528c377052ffb9e453f59ce79bdd8d87ad9e8
# Parent  1f90796f6106245defb4813775e7ad5664d243e4# Parent  c2c1a3b30a1745cbc2d38d12d59827585f2e702c
Merge with c2c1a3b30a1745cbc2d38d12d59827585f2e702c

diff -r 1f90796f6106 -r 142528c37705 .hgignore
--- a/.hgignore	Thu Aug 30 18:33:50 2012 +0200
+++ b/.hgignore	Thu Aug 30 18:36:02 2012 +0200
@@ -1,5 +1,6 @@
 
 syntax: regexp
+^\.git
 ^\.project$
 ^web/index$
 ^web/log$
@@ -21,5 +22,4 @@
 ^sbin/sync/config\.py$
 syntax: regexp
 ^virtualenv/sync/project-boot\.py$
-syntax: regexp
 ^\.gitignore$
\ No newline at end of file
diff -r 1f90796f6106 -r 142528c37705 README.markdown