Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 08:50:07 +0000 (16:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 08:50:07 +0000 (16:50 +0800)

Trivial merge