Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 22:27:10 +0000 (18:27 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 25 Sep 2008 22:27:10 +0000 (18:27 -0400)
commit6535c61746ba6946284be674f666c99ae8af82f0
treea91598b9cc0b5114abe94ab36c961a7fe18076ae
parent965f7310fec535d17e04464019de4ca75fa0afec
parentd6d3f3a36bb76da68097372ba3440d5675ccc15c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info