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)
commitca7b16fa70f7579bc5de809d5c162ef232713875
treea3759bde777e258067273e5a16155176ff9b7569
parent9dfee70f6b5a9ac7574e07dcfe40d40ec350c3b3
parent29a004946b43c7bb9b29b0af75e7fe7cc577f739
Merge branch 'MDL-54638' of git://github.com/stronk7/moodle

Conflicts:
mod/lti/version.php