Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 22:58:50 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jun 2014 22:58:50 +0000 (00:58 +0200)
1  2 
mod/lti/settings.php

Simple merge