Merge branch 'MDL-37413-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:58:47 +0000 (10:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:58:47 +0000 (10:58 +0800)

Trivial merge