Merge branch 'MDL-30354' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:48:52 +0000 (01:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:48:52 +0000 (01:48 +0100)
1  2 
mod/lti/locallib.php

Simple merge