Merge branch 'MDL-35817_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 20:46:01 +0000 (09:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 20:46:01 +0000 (09:46 +1300)

Trivial merge