Merge branch 'MDL-30295' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
commit8efcee5f8c9333cafee40dcdd4c6de6eff8a848f
tree8ecc7241bd57ac346ea730555a84575860553a66
parent34087d7be2322b2022d142ccd8cc2a0b6a266fca
parent532ae9aa342399dcc0f2c7836682ec91e45b0fa0
Merge branch 'MDL-30295' of git://github.com/scriby/moodle

Conflicts:
mod/lti/lang/en/lti.php
mod/lti/lang/en/lti.php