Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 18:15:32 +0000 (14:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 18:15:32 +0000 (14:15 -0400)
commite9c9952b11626cdcce55e5dca8b542f5708c72ed
treed96f3fca7506eea34e6b835995880397e91865aa
parent4601b5b6f9cd674f82e1b6ab50630d1e717fe116
parent43176472636b3bc4c01fe159befaa03ecf5d9c73
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info