Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:11:14 +0000 (17:11 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:11:14 +0000 (17:11 +0000)

Trivial merge