Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 15:16:30 +0000 (11:16 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 15:16:30 +0000 (11:16 -0400)
commitbbce8b15ccfccbc3bfb0a8e231649fa3870e706b
tree550683f96cf0cb799493a2ce12281330ed73db3b
parent45edb2c99a51b65e91ee9d0a4171cc13580a8405
parent3383ebbc840047075f39c495434b212966e3e3dd
Merge branch 'master' of ssh://git.ikiwiki.info