Merge branch 'MDL-47648' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:39:48 +0000 (15:39 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:39:48 +0000 (15:39 +0000)

Trivial merge