Merge branch 'MDL-32910' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:10:03 +0000 (10:10 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:10:03 +0000 (10:10 +0800)

Trivial merge