Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)
commit729132fa6ab9b2a124a4441fbc9920b4ec44c345
tree6272ea47cfae81fb8452b98a6c85849e2a196324
parentcead8a81388c1644db892947f4c3eb9fe73a89d5
parent7dbc501811e1d1dd88d1992715facf4e3b48b5e5
Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle