Merge branch 'MDL-56979-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 09:46:09 +0000 (10:46 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 09:46:09 +0000 (10:46 +0100)
commit0a4d8ea1a52e41fa02a5526eae22615aecb7413b
tree4f861370baee7b97d9ee3339031febd1f73deea8
parent275b5fa8ce499c32144492f0b29d0765508fc94d
parent3b5865396ed8aa88aab311959e4109b59a115daa
Merge branch 'MDL-56979-master-2' of git://github.com/junpataleta/moodle