Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)
commit7fddfd3768c1ef9121df5bf6ceea5411654338e8
tree4d58ff80e7666fbae535499098a7582770506eff
parent1f0daa292e9fe4445d369910f62416cee403fd9d
parent6a1131e2c24c268898353a4e58c0692b7c269d91
Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle