From: Bernie Innocenti <bernie@codewiz.org>
Date: Tue, 24 Nov 2009 18:22:08 +0000 (-0500)
Subject: Merge commit 'giskard/master'
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=8e6f34588270b805d4151da2a66abf3f2f35c891;p=geekigeeki.git

Merge commit 'giskard/master'
---

8e6f34588270b805d4151da2a66abf3f2f35c891