Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github...
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:12:09 +0000 (15:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:12:09 +0000 (15:12 +1300)

Trivial merge