Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jun 2016 17:12:02 +0000 (19:12 +0200)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:58 +0000 (09:24 +0100)
1  2 
mod/lti/lang/en/lti.php

Simple merge