From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 27 Jul 2009 07:34:26 +0000 (+0200)
Subject: Merge commit 'remotes/smcv/gitignore'
X-Git-Tag: 3.15~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6cdaa689df23af63cd24cb4851709d71a4af7fe;p=ikiwiki.git

Merge commit 'remotes/smcv/gitignore'
---

d6cdaa689df23af63cd24cb4851709d71a4af7fe