Merge branch 'MDL-49629' of https://github.com/spvickers/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:00:35 +0000 (12:00 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:00:35 +0000 (12:00 +0100)
1  2 
mod/lti/locallib.php

Simple merge