Merge branch 'MDL-43068' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 03:11:07 +0000 (11:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 03:11:07 +0000 (11:11 +0800)

Trivial merge