Merge branch 'MDL-21625_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 03:27:30 +0000 (16:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Nov 2012 03:27:30 +0000 (16:27 +1300)

Trivial merge