Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 15:29:26 +0000 (11:29 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 15:29:26 +0000 (11:29 -0400)
commita42bbcb875aeb1e6715842cdb926952e18a3e439
tree4d8590e1579b655d36ccd605925a031376549678
parenta24c0c543d4e4111dc206813889558bd5376fc8e
parentac5164db382a79f5a68b9618c72cc3c02eb87bbf
Merge branch 'master' of ssh://git.ikiwiki.info