Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Jan 2013 20:10:23 +0000 (09:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Jan 2013 20:10:23 +0000 (09:10 +1300)

Trivial merge