Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 13 Feb 2010 19:08:06 +0000 (14:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 13 Feb 2010 19:08:06 +0000 (14:08 -0500)
commit407dff979ce253ca912ddd0869794e7402c32901
treecc4b347ee4c18ffb32e0b6732de727a6a9e244ba
parenta38418a8a3652bad60c83a0dd7502f7afb991512
parent172dfa9f64b5a248042af7c4b741fdd4c71813ec
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info