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)
commitdb074792b92539cf0afd3b64fa584654e4166753
tree6ff4b55b21215acc4a71a1683b8c9914aa60e7b9
parente8cf07fa5193bd2ff05317d88c29340352fc3cc3
parenta73b1ba23fe780f9cbf8772d135daa889731bcfc
Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle