Merge branch 'MDL-27325_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 May 2011 02:35:31 +0000 (10:35 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 May 2011 02:35:31 +0000 (10:35 +0800)
commit8f25ae26db4c21efc5935641c4681327dec0fb0e
treec5073c96d23282bf2cdf91fa1a1431638034b58b
parent644b14c552f94048954ecf92b696dca04f4a411a
parent86f456d8f0834e03b5bf6b9b9dd2ae41574cd164
Merge branch 'MDL-27325_master' of git://github.com/stronk7/moodle