Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 17:00:29 +0000 (13:00 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 17:00:29 +0000 (13:00 -0400)
commit1cf4536289396726f0ee858f46a3f133d1675c68
tree0c1e40ca74b99f082909123ce206078e7608eaa7
parentfd817f9ac3c074622fe7076516dca61199b09372
parent6578dc2c2b2bc8e1947ba50b914cacd48c30c860
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info