Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:41:08 +0000 (11:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:41:08 +0000 (11:41 +0200)
commitc32f0cd62a397da42a0804640399aea3a9753415
tree65629553462ce3b1f1822f3c79803ead5e4fd2e1
parentce836829e6c0ae7f4e0b2419f813de6bd18678b0
parent29d409b642d9a20d6407502025e142548a546194
Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle