Merge branch 'mdl41908-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 02:27:07 +0000 (10:27 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 02:27:07 +0000 (10:27 +0800)

Trivial merge