Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 18:25:08 +0000 (14:25 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 18:25:08 +0000 (14:25 -0400)
commit39717d0dbf66447a9f55b2bf27da413f37f4577c
treeae8568f299f7025a3528393be210311d33693e87
parent7f6ebcd53e53d6b20c02047a6b3c57f8339dbca1
parent31240a9dd671a6bcb138bd5620b5a41abb79db8a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info