From: Bernie Innocenti <bernie@codewiz.org>
Date: Wed, 19 Aug 2009 10:11:20 +0000 (+0200)
Subject: Merge commit 'giskard/master'
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=3f2b20eacb2910d0c16206c67b7751d7523389ca;hp=-c;p=wiki.git

Merge commit 'giskard/master'

Conflicts:
	sys/footer
---

3f2b20eacb2910d0c16206c67b7751d7523389ca