Merge branch 'MDL-27414' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 04:06:42 +0000 (12:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 04:06:42 +0000 (12:06 +0800)

Trivial merge