Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 22:29:20 +0000 (18:29 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 22:29:20 +0000 (18:29 -0400)
commitbb09a1f0010b749ac466f658b1a588bb2734bd84
tree6ce9487f16f566b486420871d886d65a83b0cd13
parentd5eb5401496db1d7374a23f996e6924338d14ae2
parenta8761a086ebf353192e4721090ff11d3f67707b6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info