Merge branch 'MDL-37635-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:57:25 +0000 (11:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:57:25 +0000 (11:57 +0800)

Trivial merge