Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 08:01:22 +0000 (16:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 08:01:22 +0000 (16:01 +0800)

Trivial merge