From: Bernie Innocenti <bernie@codewiz.org>
Date: Sat, 13 Mar 2010 17:32:08 +0000 (-0500)
Subject: Merge commit 'giskard/master'
X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=bbefa04e94ab596cf3afef2d4603ddbdf4413461

Merge commit 'giskard/master'
---

bbefa04e94ab596cf3afef2d4603ddbdf4413461