Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)
commit50d64a6efa20bf68e401476dd851905b79f3f02a
tree89a2c6152a43982bf714b029776ced909a6e16a1
parentbfccdb9600dd908e04c5b5302794c3121525e4fd
parent7dc0db71952a80f868145fa94c1ac0124f8c531c
Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle