Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:28:44 +0000 (18:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:28:44 +0000 (18:28 +0100)

Trivial merge