Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 13 Nov 2009 22:30:59 +0000 (17:30 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 13 Nov 2009 22:30:59 +0000 (17:30 -0500)
commitce4fa7768cce4b5a18c7154a81bd9fe184b5b29d
tree977e6964679e12f3923c8c628e179c8cc471e435
parent2bd6ebb42ce3e7a91866f6731563926b09e7806f
parent2a7e8921d5ace6ca6a053e964d459f5190fc552b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info