Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 14:54:44 +0000 (10:54 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 14:54:44 +0000 (10:54 -0400)
commitc76909d035effd8050081e43736c570372d36c10
tree7b6a134b3903bf15cd71dcb13942b2a9c4443702
parent5c514706e43e8e4bff7b4620db4add6eed9a5bca
parented2071802f3f637e191eaefbf264f4439b2b3e2d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info