Merge branch 'MDL-33818' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 13:33:26 +0000 (21:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 13:33:26 +0000 (21:33 +0800)

Trivial merge