Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 04:33:39 +0000 (12:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 04:33:39 +0000 (12:33 +0800)
1  2 
mod/lti/locallib.php
mod/lti/tests/locallib_test.php

Simple merge
Simple merge