Merge branch 'MDL-54008_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 08:52:16 +0000 (09:52 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 08:52:16 +0000 (09:52 +0100)
commit3b846632d1dc7784063e96145adea7d913b7c00c
tree5f7d66cde1a038769e78f060d3b9df2337283e80
parent71c0a5745c6faae33eff38c6876acb2fa19c9ea1
parentdd215cb1a3188a67125907811e43280bcc64e8aa
Merge branch 'MDL-54008_master' of git://github.com/dmonllao/moodle