Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:17:02 +0000 (11:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Feb 2016 11:17:02 +0000 (11:17 +0000)
commit3bb9f374e73069a12229db9183f6d64a7796d59c
tree2c133e3ffb12181a8da9d1647852196a87c0f4f4
parent89881711dae5b5a4ac846fd1c497ab44f4ece0a2
parent635166b8c8d8f5e6be5c5c7e54a71ddf19e32b85
Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle