Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 00:08:24 +0000 (19:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 00:08:24 +0000 (19:08 -0500)
commite96aa16ab959e62c4ce826c599e48a959ebc3e64
tree9399a7a7d90542ab82abfde4098b14a5c13bd20c
parenta01e0679f4134f849473f8a98cb43f5a4aa8d7d8
parent4da6e94305c2c7f4adab057b362d9e58a7494439
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info