Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Nov 2012 01:55:22 +0000 (14:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Nov 2012 01:55:22 +0000 (14:55 +1300)

Trivial merge