Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)
commit1ea1180a6f01729c0b656b7d2524a9782831dc90
tree18f9a883af70eabc689f913dfad53ad8236e58b3
parentaed2641a8b71824bdad9887ef1d85f22ab4e75f5
parentd689c1ed466bf0fc25cccf776212cce6e3b25fef
Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle