Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 13:11:39 +0000 (14:11 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 13:11:39 +0000 (14:11 +0100)

Trivial merge