projects / wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8578cf5 9b09bf0)
Merge commit 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Wed, 19 Aug 2009 10:11:20 +0000 (12:11 +0200)
committerBernie Innocenti <bernie@codewiz.org>
Wed, 19 Aug 2009 10:11:20 +0000 (12:11 +0200)
Conflicts:
sys/footer


Trivial merge
Bernie Innocenti's wiki home page