Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:45:03 +0000 (09:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:45:03 +0000 (09:45 +1300)

Trivial merge