Merge commit 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Tue, 24 Nov 2009 18:22:08 +0000 (13:22 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Tue, 24 Nov 2009 18:22:08 +0000 (13:22 -0500)
1  2 
geekigeeki.py

diff --cc geekigeeki.py
Simple merge