Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)

Trivial merge