Merge branch 'MDL-56959-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 07:53:31 +0000 (07:53 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 07:53:31 +0000 (07:53 +0000)
commitff308ab4fbac7e45d692de4089b1005624c019a0
tree2fe21fda712045aa119cda50e4146cb7034d5838
parentcb3f67364d502f2953333fc8ce328c9d08e13544
parent755b013fdfd6103a8ff81cb2d79a12aca0e020c9
Merge branch 'MDL-56959-master-fixup' of https://github.com/FMCorz/moodle