Merge branch 'MDL-56403_master' of git://github.com/markn86/moodle
commitb580f395562b033372833e6a516753991f984198
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 08:27:42 +0000 (25 09:27 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 08:27:42 +0000 (25 09:27 +0100)
treeecf3965875537458d7a21dc60ddc8434a5367e91
parent737e3c3b67d43367aa34dfecf2e14ec7b866205c
parentf9408b6dd74e52c5ff84a5d9499cae17b2196817
Merge branch 'MDL-56403_master' of git://github.com/markn86/moodle