Merge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:02:45 +0000 (17:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:02:45 +0000 (17:02 +1300)
commit114824a6b9c3a2f4f017cddfb383b66f3faefa53
treeff87a44bf37e9a21968dfe11378a6ca493772269
parentf53b63481f4076919ba43ac606081d09a3fb029a
parent76565fa1029ed2d884c880afbfc870493f1b2a29
Merge branch 'wip-MDL-31463-master' of git://github.com/abgreeve/moodle