Merge branch 'mdwn_itex' into wtk
authorW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:13:10 +0000 (07:13 -0500)
committerW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:13:10 +0000 (07:13 -0500)
commit6adf406ae2c66d86aaa7bd725474b4081039e2f6
treef50a7d544b960821a274a102859493002173db1b
parentaa98a78a9b9cde0e3e411459bc601f8f43896cc5
parentaf87ef5c96378dcfcdb585a3f0215e5a18d49011
Merge branch 'mdwn_itex' into wtk