Merge branch 'MDL-33079' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 05:26:36 +0000 (13:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 05:26:36 +0000 (13:26 +0800)

Trivial merge