Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 18 Mar 2010 03:22:26 +0000 (23:22 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 18 Mar 2010 03:22:26 +0000 (23:22 -0400)
commit6cae23dbbe073a29400e89236b27ab7718fe2d54
tree4c8bb2fcca72798d4e19bd03b919597b0fc3b887
parentcbc5fcff6182e620578fff619ae021eb5b30024c
parent4054f8d8ce0802b43e1c2c6f9cb71badbbcaf919
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info