Merge branch 'encukou-markdown-identifiers'
authorEevee <git@veekun.com>
Wed, 13 Apr 2011 04:34:39 +0000 (21:34 -0700)
committerEevee <git@veekun.com>
Wed, 13 Apr 2011 04:34:39 +0000 (21:34 -0700)

Trivial merge