projects / geekigeeki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbefa04 49c44a8)
Merge commit 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Fri, 19 Mar 2010 13:12:37 +0000 (09:12 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 19 Mar 2010 13:12:37 +0000 (09:12 -0400)
1  2 
geekigeeki.py patch | diff1 | diff2 | blob | history

diff --cc geekigeeki.py
Simple merge
GeekiGeeki, minimalistic wiki a Git backend