Merge branch 'MDL-35978-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:13 +0000 (09:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:13 +0000 (09:54 +0000)
commitb040b5234027bd0e166c248fe7857807156ccf60
tree6a99481adeb9ccbab6f6eeef13a7cfa72555c8aa
parent9e3df32f5c4292e44d62ed35f46af6ea40cc7c6e
parentaf65270e875e11887a89b61a62cc5a27cddb9e8a
Merge branch 'MDL-35978-master' of https://github.com/snake/moodle