Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:36:59 +0000 (10:36 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:36:59 +0000 (10:36 +0800)

Trivial merge