Merge branch 'MDL-32791' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 09:46:13 +0000 (17:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 09:46:13 +0000 (17:46 +0800)

Trivial merge