From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 18 Oct 2007 21:30:44 +0000 (-0400)
Subject: Merge branch 'master' into mrconfig_bestguess
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/4c155e72e66ff5d1122b4c9f583514725308ad04?ds=sidebyside;hp=4c155e72e66ff5d1122b4c9f583514725308ad04

Merge branch 'master' into mrconfig_bestguess
---