Merge branch 'MDL-55736-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 12:48:46 +0000 (13:48 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 12:48:46 +0000 (13:48 +0100)
commit0022812b71e99a3e3a3c6a023df811d4c47936a2
tree8232a053417c680984f6718538731e1f1194dcb5
parentcfa69ad26061e2caafb34c4bddd7b06ff5a4c0d5
parentba92a049f404cbcc596c9111b077ef9ec7fa462b
Merge branch 'MDL-55736-master' of git://github.com/FMCorz/moodle