Merge branch 'MDL-29872_c_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:12:47 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:12:47 +0000 (11:12 +1200)

Trivial merge