Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)
commitbb72d31944464b8b0166c07cbd13e268b1369ab4
tree5ea22c793e78340047ebb924fbae6cd189b58dd9
parent5bd052f8092cb57e06f722ec45053577129b70ea
parent66234de24cbbcea68cde94207138b2f2b94d61d6
Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle