Merge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into...
authorDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 16:03:56 +0000 (00:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 16:03:56 +0000 (00:03 +0800)

Trivial merge