Merge branch 'MDL-37574-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:14:22 +0000 (16:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:14:22 +0000 (16:14 +0800)

Trivial merge