Merge branch 'MDL-39947_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:20:56 +0000 (16:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:20:56 +0000 (16:20 +0800)

Trivial merge