Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)
commitb55853ff63c71722134245627cb10469a8423781
treef34cf03bc9358738a80d0d50f45c8dd3bfe20f06
parent92fe97f922c2f03496b54f7f171ab4f1b9db1cd3
parent4146e4352be61a2ba005af64691a4e26cee078a4
Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle