Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 12:23:09 +0000 (12:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 12:23:09 +0000 (12:23 +0000)

Trivial merge