Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git...
authorBernie Innocenti <bernie@codewiz.org>
Fri, 1 May 2009 13:25:40 +0000 (15:25 +0200)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 1 May 2009 13:25:40 +0000 (15:25 +0200)

Trivial merge