Merge branch 'MDL-30341' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:11:54 +0000 (01:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Nov 2011 00:11:54 +0000 (01:11 +0100)
1  2 
mod/lti/lang/en/lti.php
mod/lti/lib.php
mod/lti/mod_form.php
mod/lti/version.php
mod/lti/view.php

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