Merge branch 'MDL-42548' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:34:27 +0000 (22:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:34:27 +0000 (22:34 +0800)

Trivial merge