Merge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 04:09:47 +0000 (12:09 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 04:09:47 +0000 (12:09 +0800)

Trivial merge