# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1339875219 14400
# Node ID 7dcc3e9f4ec393d5cad4272b547b1d8358a0bdbc
# Parent  2c4bac4c830b8773f2600f0d0fbf056e24bb5318# Parent  600054f4399156fcfa901dcfceacdc5a9ec9d6a1
Merge.

diff -r 600054f43991 -r 7dcc3e9f4ec3 .hgignore
--- a/.hgignore	Mon Jun 04 23:52:31 2012 +0200
+++ b/.hgignore	Sat Jun 16 15:33:39 2012 -0400
@@ -8,3 +8,4 @@
 .ropeproject
 tags
 build
+venv
diff -r 600054f43991 -r 7dcc3e9f4ec3 publish.sh
--- a/publish.sh	Mon Jun 04 23:52:31 2012 +0200
+++ b/publish.sh	Sat Jun 16 15:33:39 2012 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 set -e
-../../bookmarkdown/bookmarkdown/bookmarkdown build
+./venv/bin/python ../bookmarkdown/bookmarkdown/bookmarkdown build
 rsync --delete -az build/html/ sl:/var/www/vimscript/