Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 17:57:00 +0000 (13:57 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 17:57:00 +0000 (13:57 -0400)
commit72736b5e727a88284d2d021b479a557a99d4b8c0
tree430adec570c3e3ac7edcdcd8550d188984a866fb
parent5e5bb93adbce76431771d6d56faefbfef99d359f
parent0ee6705413b8e1806c3560ef94195d03d221686f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info