Merge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:29:49 +0000 (09:29 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:29:49 +0000 (09:29 +0100)
commit8eb15b447a227b51729cb0eb13a4a676248b740c
treedaaf1e25bd78909b6983dc310f1de89fbe868ea7
parent372dd3711ee7aa5ae0d1ddffa4dea3bf74c9fd6f
parentf3d38863fe499fdac1bc13707430980611e671d8
Merge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle