Merge branch 'MDL-54842-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 07:36:38 +0000 (08:36 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 07:36:38 +0000 (08:36 +0100)
commit8d7bd87e6e7a1cc9003f37475dc7d0f54ca6029b
treed1e315514d7170ff5a40670d39b34ae2b1c5c2c1
parent377b29d82646baf348940a0f160ae8bbb4efdcdb
parent5d01400a854f3d06b815dfeab39650b9f16be49f
Merge branch 'MDL-54842-master' of git://github.com/junpataleta/moodle