Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 09:08:01 +0000 (09:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 09:08:01 +0000 (09:08 +0000)

Trivial merge