Merge branch 'MDL-19069_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 27 Jan 2013 22:32:32 +0000 (11:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 Jan 2013 22:32:32 +0000 (11:32 +1300)

Trivial merge