Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/geekigeeki
authorBernie Innocenti <bernie@codewiz.org>
Wed, 19 Aug 2009 10:07:05 +0000 (12:07 +0200)
committerBernie Innocenti <bernie@codewiz.org>
Wed, 19 Aug 2009 10:07:05 +0000 (12:07 +0200)
commit2776ec9d104a0cd3fefb2ebb09bf32f4f13cc80a
tree1a5d01f01f98a9cbf1e6423e6928ec6cf6bc6f16
parent8572b870b28b6ecaba354ab47a4dc016ad889c03
parent02065e3454f4dfa621af0bf4093a36ab8acdbf5a
Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/geekigeeki

Conflicts:
geekigeeki.py
geekigeeki.conf.py
geekigeeki.py