Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:55:07 +0000 (09:55 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:55:07 +0000 (09:55 +0800)

Trivial merge