Merge branch 'MDL-34991' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:45:00 +0000 (11:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 23:45:00 +0000 (11:45 +1200)
commitc458ba6cd75deb9222ba185495d48fd33cc857d8
treed37a8cb18bb50a49c24ecc9f6564e497f243b8bc
parentcc21d0ff6ea6ea0ef4520bf105211306d8c5c5c0
parent9949e91a5721814621f7a64e5af0f2adc1e6c354
Merge branch 'MDL-34991' of git://github.com/nebgor/moodle