Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 12:05:29 +0000 (12:05 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 12:05:29 +0000 (12:05 +0000)

Trivial merge