Merge branch 'MDL-57667-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:38:14 +0000 (09:38 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:38:14 +0000 (09:38 +0000)
commit948aec4a09fd47287428cc8e9a506a7ca1877089
tree65044ee8b39aa5dc3013925d7f454133d67e10ea
parent8120cbd939700165ff47ba3813b82f692db9317e
parent93b6aed00064c57c1975a8e12508c30252e6d5cc
Merge branch 'MDL-57667-master' of https://github.com/snake/moodle