Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 11:11:56 +0000 (12:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 11:11:56 +0000 (12:11 +0100)
commit2300b95dbfbc1c8fc78272c4bd3afd48e0ae0036
tree2982d182fba8849bbe82e20ee6ff95190bb49e13
parentadd9db49f48461326b127d1050b858fe754a994c
parenta4a6d85b5b93a7e5d93340267b4fbea064ceebc7
Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle