Merge branch 'wip-MDL-36413-MOODLE_23_STABLE' of https://github.com/nicolasconnault...
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:18:33 +0000 (09:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:18:33 +0000 (09:18 +0800)

Trivial merge