Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:57:12 +0000 (09:57 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:57:12 +0000 (09:57 +0000)

Trivial merge