Merge branch 'MDL-32375' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 12:42:12 +0000 (20:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 12:42:12 +0000 (20:42 +0800)

Trivial merge