Merge branch 'MDL-32684' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 05:03:50 +0000 (13:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 05:03:50 +0000 (13:03 +0800)

Trivial merge