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)
commit23dfb50687496c196b4f3ad6d8b950e7731578ef
treef6ee315792845e5044f36ba8c7d9d14c1e6da627
parente053583fc735c9b0538dafa7ccfd6f6fa4420c57
parentc2daa41a2e3ab1f439577efdb56c61dacdcf8e5e
Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle