From: Tomas Doran <bobtfish@bobtfish.net>
Date: Tue, 2 Feb 2010 02:15:43 +0000 (+0000)
Subject: Trivial merge
X-Git-Tag: 0.000006_01~1^2~20^2~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1a8ce56e2841166a11f1c4b9cc7f65cab9430944;hp=-c;p=catagits%2FGitalist.git

Trivial merge
---

1a8ce56e2841166a11f1c4b9cc7f65cab9430944