Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Jun 2011 01:43:24 +0000 (09:43 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Jun 2011 01:43:24 +0000 (09:43 +0800)

Trivial merge