Merge branch 'MDL-34607-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 21:52:00 +0000 (09:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 21:52:00 +0000 (09:52 +1200)

Trivial merge