Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:31:51 +0000 (12:31 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:31:51 +0000 (12:31 +0100)

Trivial merge