Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 07:04:56 +0000 (15:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 07:04:56 +0000 (15:04 +0800)

Trivial merge