From: Bernardo Innocenti <bernie@codewiz.org>
Date: Fri, 28 Mar 2008 10:51:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git... 
X-Git-Tag: v3.0~25
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=ec3e42d01c1a77dff06032e35983b0e9933302c8;p=geekigeeki.git

Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git/geekigeeki

Conflicts:

	geekigeeki.py
---

ec3e42d01c1a77dff06032e35983b0e9933302c8