]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'origin/pristine-tar' into pristine-tar
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 8 Sep 2008 16:29:56 +0000 (12:29 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 8 Sep 2008 16:29:56 +0000 (12:29 -0400)

Trivial merge