Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 06:43:31 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 06:43:31 +0000 (14:43 +0800)

Trivial merge