Merge branch 'MDL-33624-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jul 2012 01:50:56 +0000 (13:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jul 2012 01:50:56 +0000 (13:50 +1200)

Trivial merge