Merge branch 'MDL-32300' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 09:42:28 +0000 (17:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 09:42:28 +0000 (17:42 +0800)

Trivial merge