Merge branch 'MDL-49671-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 14:05:37 +0000 (15:05 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 14:05:37 +0000 (15:05 +0100)

Trivial merge