Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:01:04 +0000 (14:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:01:04 +0000 (14:01 +0800)

Trivial merge