Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 1 Jul 2011 07:07:21 +0000 (15:07 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Jul 2011 07:07:21 +0000 (15:07 +0800)

Trivial merge