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)
commit5f5d4e9e69c85171790240de8849c6db0d4102ee
tree3fc85f5d2f84d72ba7366a112ef62187757b657c
parent0734383d6373da7cb4ecf1eb678721e7827c98ff
parentea5d05151b880261554c3dc89da51216ddc26b5b
Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle
mod/lti/lib.php
mod/lti/mod_form.php