]> git.wincent.com - wikitext.git/commitdiff
Merge branch 'master' into maint
authorWincent Colaiuta <win@wincent.com>
Wed, 10 Sep 2008 09:10:42 +0000 (11:10 +0200)
committerWincent Colaiuta <win@wincent.com>
Wed, 10 Sep 2008 09:10:42 +0000 (11:10 +0200)
Signed-off-by: Wincent Colaiuta <win@wincent.com>

Trivial merge