Merge branch 'MDL-37934' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:55:51 +0000 (10:55 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:55:51 +0000 (10:55 +0800)

Trivial merge