From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 26 Oct 2007 00:55:48 +0000 (-0400)
Subject: Merge commit 'madduck/master'
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/920d455be8153c1eb9b826d3b894aadc38d9aec1?ds=sidebyside

Merge commit 'madduck/master'
---

920d455be8153c1eb9b826d3b894aadc38d9aec1