Merge branch 'MDL-45764_generalTool' of https://github.com/moodlerooms/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:01:51 +0000 (00:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:01:51 +0000 (00:01 +0200)
1  2 
mod/lti/lib.php

diff --cc mod/lti/lib.php
Simple merge