Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2016 00:38:24 +0000 (01:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2016 00:38:24 +0000 (01:38 +0100)
commit7b0057b89579183cd9603d59ecfc519eb2f16322
tree27872e8301d127c62c61165b890239dbbe8f8350
parent7d3a7bbd1f0069b3392473ee142218fa54625ac9
parent3b195bfb810dd96f4c624295b4707ac344c56850
Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle