Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Jan 2014 01:32:36 +0000 (09:32 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Jan 2014 01:32:36 +0000 (09:32 +0800)

Trivial merge