Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Jan 2009 19:28:25 +0000 (14:28 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Jan 2009 19:28:25 +0000 (14:28 -0500)
commit5a847e638ceb5a0a8219ef65d31e7fb75d4f0a8e
tree93856a3e113613ba3b179be9ffd3ae9ff9ea6aa2
parent85dcc2958a6f092a2841b4bb232a327dbf5c30b5
parent52c30dd9f3701a7782a8d77ea70d894087eaa473
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info