Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 01:18:02 +0000 (09:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 01:18:02 +0000 (09:18 +0800)
commit59023e77997544e8b38f49838e8de2cca777602e
tree91e6ceefca76ea754cd8cb8cb865962d75755c05
parent9b01f6859718208229ad9b964d39578b3fba0bce
parentc44299c172cc15c54bfe129d2edfd4724bc89314
Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle