Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 01:29:29 +0000 (21:29 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 01:29:29 +0000 (21:29 -0400)
commit9e55aa7f174810119cee77e47df5979c40490662
tree734bf597120a79b08b6a9574609fbaa3c4f947ff
parent3f35e2abbec79bcd2610173a4e74d9f03c94975d
parent8e68780b960a7921d8e001c5a728ab5e4aa1cb62
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info