Merge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:44:15 +0000 (13:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:44:15 +0000 (13:44 +0800)

Trivial merge