Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:20:29 +0000 (09:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:20:29 +0000 (09:20 +1300)

Trivial merge