Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Nov 2013 07:37:01 +0000 (15:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Nov 2013 07:37:01 +0000 (15:37 +0800)

Trivial merge