Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Jun 2011 02:49:29 +0000 (10:49 +0800)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Jun 2011 02:49:29 +0000 (10:49 +0800)
commit54ae8ed032408b1c1087000017a4f58c13b1049c
tree87b9347711ace8c8d108079c365a1fbf23b9746d
parent4ea6ce7e39fcfa0d87ea98c6e14bc5f5c59c1a55
parentb7a45fa7826c1bc022725b9baf87bb9a8257c2ba
Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle