Merge branch 'mdl55456-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:26:05 +0000 (21:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:26:05 +0000 (21:26 +0000)
commitf99e7ef116a09479fae74cb17095428fb5b43cf5
treee33d9993a0a3fcc8e801210fc111cf161440aae1
parent3a24b255baf11520ea705b302f974f532783beb6
parent0ee41475ae7799e5ce21971275d3ef29818f8f22
Merge branch 'mdl55456-master' of https://github.com/tlock/moodle