Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 21:11:33 +0000 (17:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 21:11:33 +0000 (17:11 -0400)
commitd7cd669470a5c8a920032baac6665bfc8eb4bd5b
tree601d05160546929c20af13128fd1353d9f92aec2
parenta4b4b464d27490d3868e8430a6f833b54a625cad
parent8e8b011c1a64cc15b08e0e61f1bb85eede1e3318
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info