Merge branch 'MDL-54025_master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:38:30 +0000 (11:38 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:38:30 +0000 (11:38 +0100)
1  2 
mod/lti/locallib.php

Simple merge