Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)
commit41dd0ac8d4613bb5e1d8c2cbda7d23a7e044e888
treea4481c1cf25584c06cfb3967a310a5ac5d17f373
parent0893bb0897f13adafd4d321d2c5496a1dbb3156b
parent6c563ccedfa677909d33fe2ff01a7481554f7a53
Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle