Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:16:07 +0000 (11:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 22:16:07 +0000 (11:16 +1300)

Trivial merge