Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 9 Mar 2009 18:29:06 +0000 (14:29 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 9 Mar 2009 18:29:06 +0000 (14:29 -0400)
commitf24904b160c76adf2fc079a8f1a7a1e5bd1628e5
tree6b9f79ebe574ceb6647b1e301104ef98983db245
parent4ac0b2953131d7a53562ab8918c8e5a49952d8ac
parentb978a5773ea7a363d9588f6825ac5e47e32d4453
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info