Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 05:47:22 +0000 (13:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 05:47:22 +0000 (13:47 +0800)
Conflicts:
mod/lti/version.php


Trivial merge