Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Jul 2013 22:53:05 +0000 (10:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Jul 2013 22:53:05 +0000 (10:53 +1200)

Trivial merge