Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:48:11 +0000 (09:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:48:11 +0000 (09:48 +0000)
commitee2af37e843645b45dee02b8754bded0b82bb296
tree61bd638f82aed0c81c6fe9277bcd3e7d70c1c5bc
parentc7f9bbf6c17968f68992f175e76de76712cce2ed
parent106f23730a6b18b2bd326f81be17c7b6350db0dd
Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle