Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 05:08:33 +0000 (13:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 05:08:33 +0000 (13:08 +0800)
commit242c4319ab9f4640f58f9f7caee9748c6a6043b8
tree141a4962b82ddedc0494fc8bbf6b377e746249c7
parentbec662a0f603aceb43682874a51edd05c9600930
parent4cb02426ff0ecc4f917ea9812ba96022eaa2feb8
Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle