Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 10:53:41 +0000 (10:53 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 10:53:41 +0000 (10:53 +0000)

Trivial merge