Merge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 02:15:00 +0000 (10:15 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 02:15:00 +0000 (10:15 +0800)

Trivial merge