Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:30 +0000 (09:07 +0000)
commit642bbbdd10ad3a8271eeed944dcc719f8bca7127
treecf1e168b70e46c44a654a2190a8f000f06807fe7
parent4678592332e5996542822b94b3a39716c888f53e
parent7dbc501811e1d1dd88d1992715facf4e3b48b5e5
Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle