Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 02:47:38 +0000 (14:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 02:47:38 +0000 (14:47 +1200)
1  2 
mod/lti/locallib.php

Simple merge