Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 07:49:24 +0000 (15:49 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 07:49:24 +0000 (15:49 +0800)
commit12aafa87699878c0dc413c12a89046c207f9779d
tree057317adf96a396320304dd35cbc179035804442
parentf44c912bd0aa0164c91246b98d7f69fc423b1e9a
parent2875714e4a35f6104781cc5bd84d5237ce5db9e7
Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle