Merge branch 'MDL-49143-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE
commit2523ec4ba97b7244e7fc0ff650b79f5a40fdfae3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 01:12:33 +0000 (30 03:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 01:22:05 +0000 (30 03:22 +0200)
tree78936bf259364a58f2bcd4c049acc3a441884f60
parent1f93fcfe46ea72b7e131d526f499f2e158b5bc6b
parent8ae030ea2620ab0810ad6305a14ef22d3ef5b31d
Merge branch 'MDL-49143-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE

Note: Added minor fix to unit test.
mod/lti/tests/locallib_test.php