Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)
commitaed2641a8b71824bdad9887ef1d85f22ab4e75f5
treed64d40802e2f16da0c7222ec5707d9c9f81857f5
parent98c4094eac26779c35ace2df30cd4c07057a80cc
parent4ac71790b6b4d45495138e581cbe8b7e01c7ed05
Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle