Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle
commitc70b9e8451cf3d0998e30c8bb387a43ba68ebe2e
authorDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 10:24:36 +0000 (18 11:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 10:24:36 +0000 (18 11:24 +0100)
tree4b7fc8dfcbc5bd678a73a10cd48b93ea4d7ab970
parent772c7b4733852e2dfaf9197d001bd20022ae64f5
parent7001a3b273f279802a9c9ed7881da2aef2c6097f
Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle