Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:28:53 +0000 (14:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:28:53 +0000 (14:28 +1300)

Trivial merge