Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:07:48 +0000 (15:07 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:07:48 +0000 (15:07 -0400)
commitf6402d22caeecf481826b60791d84cb53210f686
treeafc0a08c16bb301b05866d7ffc8a54b0c8bca307
parent7e326ebfce89b7e81b361afacefa361fd8919586
parent129bde667604a73e26fce2491dd5e431aef143af
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info