Merge branch 'wip-MDL-54129-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 09:17:39 +0000 (10:17 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:09 +0000 (17:16 +0800)
1  2 
mod/lti/locallib.php

Simple merge