Merge remote-tracking branch 'skodak/w03_MDL-27165_m23_confirmed'
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:17:28 +0000 (16:17 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:17:28 +0000 (16:17 +0800)

Trivial merge