Merge branch 'm31_MDL-49557' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE
commit65e7dd77989af94fad0c75d33090db3e66e9136c
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:35:11 +0000 (2 12:35 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:35:11 +0000 (2 12:35 +0000)
tree8195276fe26b4524b6d07a3a64061b3cc6fb1cf7
parent8dea0f4533882318c2e3725c0f429cfe8fe4a7cb
parent751e80769ca741770fc3c3a3c11815f183682077
Merge branch 'm31_MDL-49557' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE