Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 04:42:27 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 04:42:27 +0000 (12:42 +0800)

Trivial merge