Merge branch 'master' of https://github.com/moodle/moodle
authorYang Yang <doraemonyoung@yahoo.com>
Thu, 12 Apr 2012 23:22:46 +0000 (11:22 +1200)
committerYang Yang <doraemonyoung@yahoo.com>
Thu, 12 Apr 2012 23:22:46 +0000 (11:22 +1200)
commita96cbb5162d943f8faaa318ebd7793f63b1e9f5b
tree34bf87cc1f62f380bdcd62e33b212ba5b78c5afa
parent5c631d86c2cfff2e2c39b86a95807eb5f9bf48cc
parent668a499d891a5c9803957749c679b0d1236fc900
Merge branch 'master' of https://github.com/moodle/moodle