Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:04:17 +0000 (15:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:04:17 +0000 (15:04 +1300)

Trivial merge