Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:12:39 +0000 (10:12 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:12:39 +0000 (10:12 +0800)
commit256383c07d1a87f983474d650023d74cfae6bc83
tree5ece52bada917e7ed7164a44d2f5089bd264cd05
parent7fde489daee17d91f9080c2422eba854761d6597
parentb7030c3def2381020f803d836f82e39540278620
Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle