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

Trivial merge