Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:25:52 +0000 (18:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:25:52 +0000 (18:25 +0200)

Trivial merge