Merge remote-tracking branch 'skodak/w03_MDL-30958_m23_yuissl'
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 06:55:52 +0000 (14:55 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 06:55:52 +0000 (14:55 +0800)

Trivial merge