Merge branch 'MDL-56339-master' of git://github.com/junpataleta/moodle
commit85c9053aec3ffbbe5e286e480152dd18baf2f7a7
authorDan Poltawski <dan@moodle.com>
Fri, 28 Oct 2016 08:47:15 +0000 (28 09:47 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 28 Oct 2016 08:47:15 +0000 (28 09:47 +0100)
tree5ba164b8be9acdcffa89f2dc5bfc0ce02dd2aad3
parent577bd70d3896fd8b505afdc13dda703126903175
parentf30f627501e783da582645064dab4c280e0bafdc
Merge branch 'MDL-56339-master' of git://github.com/junpataleta/moodle