]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'smcv/atom'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)

Trivial merge