Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 11 Oct 2012 15:22:50 +0000 (11:22 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 11 Oct 2012 15:22:50 +0000 (11:22 -0400)
commitef0c569a956f97ee02df16c1a3e8f3cb2993a62a
tree8d361020a0db3a44c989acd9410d28d87848bca7
parentb1cd1c067f5f5d20afc4db3731fa5cebaeed0635
parentf5644ae9fb30e620a6ba05493ae6ce665b71eaec
Merge branch 'master' of ssh://git.ikiwiki.info