Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 09:35:21 +0000 (09:35 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 09:35:21 +0000 (09:35 +0000)
commitb7f3b1365d0c0e9e512489d2a47a074f65c8dbf9
tree9401bbc8110980c624515cb30e9db8b6fa6b3877
parent75de2e619930bfc1d720155c33fda9c7816e2abf
parent6511cf7795612d2f7ffc73429dfa6cd4db8a5898
Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle