Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 17:56:54 +0000 (13:56 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 17:56:54 +0000 (13:56 -0400)
commit586c35de30781821050c6f3237da2340ca6a51b5
tree0843b7c7e6b9324c93f301e9325a290a601c4f75
parent3baf6980aa5725b647bf72452be2c05db1ad0bff
parente82aeb3e4359d3d07f6dbbee7c12cbcbbc1aa4b4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info