Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 14:33:39 +0000 (16:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 14:33:39 +0000 (16:33 +0200)
commit5c7d164ff45796bcc845eb1713f08136f2f1518a
treec4be5b7be5fb97c1091a61d36d7260e4e127f447
parent17c9a3ccbf85c5f8da0f48a749da2211987c705e
parente9033d11e17a4ad1c33107f4e5f4ab81c1456d04
Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle

Conflicts:
mod/lti/version.php
mod/lti/locallib.php
mod/lti/settings.php
mod/lti/version.php