Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 08:20:15 +0000 (16:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 08:20:15 +0000 (16:20 +0800)

Trivial merge