Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 10:51:23 +0000 (10:51 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 10:51:23 +0000 (10:51 +0000)

Trivial merge