Merge branch 'MDL-42033' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 02:32:33 +0000 (10:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 02:32:33 +0000 (10:32 +0800)

Trivial merge