Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 15:42:58 +0000 (15:42 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 15:42:58 +0000 (15:42 +0000)

Trivial merge