Merge branch 'MDL-25907_wip'
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:53:24 +0000 (10:53 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:53:24 +0000 (10:53 +0800)
commit227d6da5d870895beadc70a52a19dd7969ef8982
tree8bc01c76f3ef4d95113f63d68ad9fe19e7c26841
parent0f1363069191ca2e7527067110a2d5712515e671
parent3b15d04013be3d1ac496b3cff0c47b3edb4ba76c
Merge branch 'MDL-25907_wip'