Merge branch 'MDL-53988-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:43:27 +0000 (11:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:43:27 +0000 (11:43 +0800)
1  2 
mod/lti/lang/en/lti.php
mod/lti/locallib.php

Simple merge
Simple merge