From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 26 Oct 2007 06:30:51 +0000 (-0400)
Subject: Merge commit 'madduck/master'
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/a33917423c99bcf6dc02d939e7956a746aa974ca?ds=sidebyside;hp=--cc

Merge commit 'madduck/master'
---

a33917423c99bcf6dc02d939e7956a746aa974ca