Merge branch 'MDL-33984' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 10:46:59 +0000 (18:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 10:46:59 +0000 (18:46 +0800)

Trivial merge