Merge branch 'MDL-43412' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 02:46:22 +0000 (10:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 02:46:22 +0000 (10:46 +0800)

Trivial merge