Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Apr 2014 05:33:50 +0000 (13:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Apr 2014 05:33:50 +0000 (13:33 +0800)
1  2 
mod/lti/lib.php
mod/lti/mod_form.php

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