Merge branch 'MDL-33020' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:14:17 +0000 (10:14 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:14:17 +0000 (10:14 +0800)

Trivial merge