Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 19:52:06 +0000 (15:52 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 19:52:06 +0000 (15:52 -0400)
commit47367f7ba8f0ebe97832daf18d6db259e2151056
tree58dd7ccc3a32de92a00378f1deecf63486613801
parent4a7ac5c2516f14f37802604c46d1077e044dba0b
parent723586f8f2a3599f036e7b7b3ce71d26735c8374
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info