Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:13:02 +0000 (17:13 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:13:02 +0000 (17:13 +0000)
commita4391b76ee5de9078f861213d407addade9b08f0
tree476a4c81830360c6ed0164900feb1e2718d5b357
parentba8491ae3f86275ef25c992f2829ea6918bcc4ec
parent2b10cf43d190c005b82ae01470042a9ed9d6c362
Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle