Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 04:03:11 +0000 (12:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 04:03:11 +0000 (12:03 +0800)
commitec9b044d12e8b5e508a951c40c52be09d22e2bf9
treeccef8116e4480ce547501f84c4e6e8826698948a
parent3d12d1682ea7adb33446db6ae0eaa782e962b77b
parent25081b95f955bb804860fc49c5e55ca16c8b8507
Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git