Merge branch 'MDL-38981' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 05:19:10 +0000 (13:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 05:19:10 +0000 (13:19 +0800)

Trivial merge