Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:01:26 +0000 (09:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:01:26 +0000 (09:01 +0800)

Trivial merge