Merge branch 'MDL-51403-master-clilang' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 10:45:15 +0000 (11:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Sep 2015 10:45:15 +0000 (11:45 +0100)

Trivial merge