Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 02:51:38 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 02:51:38 +0000 (10:51 +0800)

Trivial merge