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

Trivial merge