Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 17:45:54 +0000 (13:45 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 17:45:54 +0000 (13:45 -0400)
commit32008f8fce2d4c513693f58b28314e08ed631cfe
tree8229b4b4146a797644131659a7ebf0d141634162
parent260ee2a28368691a5f1a7dee918717a28d28ed2e
parent375b53c26e8819a740bb1429b50b1417e70ba998
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info