Merge branch 'MDL-32786' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 04:44:19 +0000 (12:44 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 04:44:19 +0000 (12:44 +0800)

Trivial merge