Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Oct 2009 06:13:16 +0000 (02:13 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Oct 2009 06:13:16 +0000 (02:13 -0400)
commit4ba54879eb27799945f5eaf2c83ad26271f6e5b0
treee45c5249385b94fc1e8e05ca228bf1d06f05249d
parent52499701db1e7b35b2ea4db95c9bfb2182fa7fc7
parent799fb15cfd8dcae62228018303a564999201a1fb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info