Merge branch 'MDL-32620' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 12:13:43 +0000 (13:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 12:13:43 +0000 (13:13 +0100)
1  2 
mod/lti/locallib.php

Simple merge