Merge branch 'MDL-43749' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 01:36:54 +0000 (09:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 01:36:54 +0000 (09:36 +0800)

Trivial merge