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)
commit3f2b20eacb2910d0c16206c67b7751d7523389ca
tree142298b2bb85461c53aa8a501f986a077347d019
parent8578cf5f86c941fa95ba493eeb30e03cbb575b2e
parent9b09bf07ceaaff512d38fa15313d6b683efbf044
Merge commit 'giskard/master'

Conflicts:
sys/footer