Merge branch 'MDL-33480' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 08:59:49 +0000 (16:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jun 2012 08:59:49 +0000 (16:59 +0800)

Trivial merge