From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 3 Feb 2009 20:04:36 +0000 (-0500)
Subject: Merge commit 'smcv/atom'
X-Git-Tag: 3.04~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8b302cfa367f47d0c68d1f4e5fbf4f0b2aef25b;p=ikiwiki.git

Merge commit 'smcv/atom'
---

b8b302cfa367f47d0c68d1f4e5fbf4f0b2aef25b