Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 11:04:38 +0000 (11:04 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 11:04:38 +0000 (11:04 +0000)
commit5814817ceb00030838edaaa4d8980c5c41c5a663
tree0c387a11a6ec3e62178d1816546acae9cc0171cc
parenta9b85245f2417ed186c046c699470e41d5f6aeb8
parent5634310997a4b51a84edfe34c3092ec3be5d742a
Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle