Merge branch 'vendor/TEXINFO'
authorJohn Marino <draco@marino.st>
Sun, 1 May 2011 14:20:09 +0000 (16:20 +0200)
committerJohn Marino <draco@marino.st>
Sun, 1 May 2011 14:20:09 +0000 (16:20 +0200)

Trivial merge