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

Trivial merge