Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 08:11:01 +0000 (16:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 08:11:01 +0000 (16:11 +0800)

Trivial merge