Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:02:09 +0000 (17:02 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:02:09 +0000 (17:02 +0000)

Trivial merge