Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:17:40 +0000 (10:17 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:17:40 +0000 (10:17 +0800)
commit0f1363069191ca2e7527067110a2d5712515e671
treee82e69cba974d30c00bca567eb0011550cc2a193
parentc5ea8d0bcc65b8aef879232b370b89b96e186991
parent79abc6d1ebc6e8aca7d49aef54f7230edc007a08
Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle