Merge branch 'MDL-32347' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 03:34:12 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 03:34:12 +0000 (11:34 +0800)

Trivial merge