Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 02:23:35 +0000 (15:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 02:23:35 +0000 (15:23 +1300)

Trivial merge