Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:16 +0000 (13:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:16 +0000 (13:04 +0100)
commitf4f63fa6b0b4d502bb13984315c9c95abaea1d4a
tree0a483f9b46c5f9fe42c2af7a1e1a2a13650fa069
parente857608ba23afce77844316afc5afe8e2db9c40a
parentc9431a5be8dbc879b5fed693815f055d3a447c45
Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle