Merge branch 'MDL-30328' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 01:22:40 +0000 (02:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 01:22:40 +0000 (02:22 +0100)
1  2 
mod/lti/locallib.php
mod/lti/service.php
mod/lti/servicelib.php

Simple merge
Simple merge
Simple merge