Merge branch 'wip-MDL-18128-master-version3' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 22:44:11 +0000 (11:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 22:44:11 +0000 (11:44 +1300)
commit01856bf75e8678015d3cb201f74df42974387500
treef9111119a51d382ac8aaa0249373386ad9ad9efa
parent21cd532f688ef8eb640b4337f9f71ddde29a9cc6
parent2edcf21abf47551759ac80e3e59667a62f076813
Merge branch 'wip-MDL-18128-master-version3' of git://github.com/abgreeve/moodle