Merge branch 'MDL-37176_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:12:11 +0000 (10:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:12:11 +0000 (10:12 +1300)

Trivial merge