Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)

Trivial merge