]> git.wincent.com - wikitext.git/commitdiff
Merge branch 'maint'
authorWincent Colaiuta <win@wincent.com>
Thu, 11 Sep 2008 17:19:01 +0000 (19:19 +0200)
committerWincent Colaiuta <win@wincent.com>
Thu, 11 Sep 2008 17:19:01 +0000 (19:19 +0200)
Signed-off-by: Wincent Colaiuta <win@wincent.com>

Trivial merge