Merge branch 'MDL-40857' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:55:25 +0000 (13:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:55:25 +0000 (13:55 +0800)

Trivial merge