Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 26 Nov 2008 18:29:47 +0000 (13:29 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 26 Nov 2008 18:29:47 +0000 (13:29 -0500)
commit2b53ce92fdc13526544579220848130a19850b76
tree4da624004007fedf6bed9f1ae3be480b6f0700ce
parent7cc14ddf441b3eb2879489f93a6986425c424bb6
parent81c62f9b01b1c2ceaad75dec6191cbdcce5419ad
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info