Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:25:25 +0000 (15:25 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:25:25 +0000 (15:25 +0000)

Trivial merge