Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 08:35:17 +0000 (16:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 08:35:17 +0000 (16:35 +0800)

Trivial merge