Merge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:09:07 +0000 (10:09 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:09:07 +0000 (10:09 +0800)

Trivial merge