Merge branch 'markdown'
authorBrian Norris <banorris@uci.edu>
Tue, 4 Jun 2013 23:14:18 +0000 (16:14 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 4 Jun 2013 23:14:18 +0000 (16:14 -0700)

Trivial merge