Merge branch 'MDL-36456-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:30:50 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 02:30:50 +0000 (10:30 +0800)

Trivial merge