Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 4 May 2011 10:04:10 +0000 (18:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 4 May 2011 10:04:10 +0000 (18:04 +0800)

Trivial merge