Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 21:17:04 +0000 (10:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 21:17:04 +0000 (10:17 +1300)

Trivial merge