Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:25:21 +0000 (11:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:35 +0000 (16:31 +0100)
commit2af6345a6f90fc1c1a4a42490bdccb7804e1d74c
tree995ecfaf37660e315f601575374aee1bea30c7a4
parent358827f0b3493a89792055255f94edfdbcbe5165
parent115ef5f91c6944b5bba9290674f8fe7ecd1e6001
Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle