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

Trivial merge