Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 26 Aug 2009 17:05:29 +0000 (13:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 26 Aug 2009 17:05:29 +0000 (13:05 -0400)
commitb740682f221fe6cf70e083303187843a61956e7e
treed9e555524d32cb5e55f3935c16c916da3c8ba106
parent2996f0b5ee0b3a06d6476eff57b40cb2d8fc587a
parent155347837a6757bd85f9b15778133622daa006c0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info