Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 6 May 2009 03:26:15 +0000 (23:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 6 May 2009 03:26:15 +0000 (23:26 -0400)
commit968598b1bb333cc617f03948239aa9cba60566c3
treec74c3c3a323f13b77d753fe8d4bbe0677646a4ee
parentc7303303f29aa587d891a5caa691ba24dbf30f27
parenta258e92c780ffc10e1149f876572a5f33fd21c56
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info