Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:08:31 +0000 (15:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:08:31 +0000 (15:08 +0800)

Trivial merge