Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 29 Aug 2009 18:01:03 +0000 (14:01 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 29 Aug 2009 18:01:03 +0000 (14:01 -0400)
commit29db15d31cff5e8b59020ad908ea4985e62ff22e
tree3453cc49fcc213f3f998c78923961d2839c71bc0
parent44ce9563a328ecb3b5fa8fd97afa30c3033fca76
parentef69cb34c355e184b01999cf445793cebc16f0c4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info