Merge branch 'wip-MDL-31060-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle...
commit1480ead173f1bb9ba15ee1655eaae12e7c1c8d55
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 04:00:12 +0000 (16 12:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 04:00:12 +0000 (16 12:00 +0800)
treeec0a43c92ed99d280dd502026553e5871b68afea
parent2d48474f2a6fd2c46d5c200f254a41add16e221b
parente5a9af0a70b18d8f00ecedaa8696708fe5e8e74d
Merge branch 'wip-MDL-31060-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE