Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:59:31 +0000 (14:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:59:31 +0000 (14:59 +1300)

Trivial merge