Merge branch 'MDL-33575_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Jul 2012 03:50:08 +0000 (15:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Jul 2012 03:50:08 +0000 (15:50 +1200)

Trivial merge