Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 03:28:39 +0000 (11:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 03:28:39 +0000 (11:28 +0800)

Trivial merge