Merge branch 'MDL-40867' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 07:23:42 +0000 (15:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 07:23:42 +0000 (15:23 +0800)
1  2 
mod/lti/lib.php

diff --cc mod/lti/lib.php
Simple merge