Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Feb 2009 18:52:29 +0000 (13:52 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Feb 2009 18:52:29 +0000 (13:52 -0500)
commit8d26eaa9a4309e9dbd173120be108b671edad2df
tree8a188df3d3d5895b909451ab44dfdf022ebe207e
parentdf0f9811a30307100fe84586368231f16fcff2cc
parent73e18318a533c7915ab04806879aa7f7607c3516
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info