Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 13:25:38 +0000 (14:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 13:25:38 +0000 (14:25 +0100)
commit65a427cc64eb88193bb7a5f2a0ffac75ec6ec8bc
treec81d49a5bf9accde98d04a55c3b2f5650c8b742c
parent066e31fd740e41e010f91d80c064e3a9395a3bd1
parentc5a90a4a5dc62137db9947d5b3ab75d2184f3364
Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle