Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)
commitef65a6a9c500326ffeb8cdd1bc68ccce7f184089
tree32d5b096dcde848bb70bd3c87fcfe48586af267f
parentde1519002efe906dffaf4e8628b65e567d0d1e61
parentc181efe978b4d08a7a8dee55d8ab9a047e20afdc
Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle