Merge commit '8a1c048084ea5a2170e436987deaa0c5acdc8ea0' as 'blocks/clampmail'
Squashed 'blocks/clampmail/' content from commit 31653a5

git-subtree-dir: blocks/clampmail
git-subtree-split: 31653a51da4df9427153d9c748b940cb9f5736af
Squashed 'blocks/filtered_course_list/' content from commit 629a597

git-subtree-dir: blocks/filtered_course_list
git-subtree-split: 629a5971401a23ba44c513acdb07501777d43872
Merge commit '1e7bf6d34ce2617f80f7690e43174e5287d6a3ea' as 'blocks/filtered_course_list'
Merge commit '2535cc6a6b4870232aaa19272e7d948075389424' as 'blocks/quickmail'
Squashed 'blocks/quickmail/' content from commit 7bd2a93

git-subtree-dir: blocks/quickmail
git-subtree-split: 7bd2a937010cbd0dd74005de202d46ca1e3487a0
Squashed 'report/editdates/' content from commit 3884f0b

git-subtree-dir: report/editdates
git-subtree-split: 3884f0bc6a9b7dbdedf7d1f334776ca80895af98
Merge commit '7f9727e4f1e44e4c2d3b447d3ad2768f54ab6fdc' as 'report/editdates'
Squashed 'report/roster/' content from commit f57ed2c

git-subtree-dir: report/roster
git-subtree-split: f57ed2c0b51ae7001fb105674928831b7b730560
Merge commit 'b0b3eadfe04c77aa76b593abd4fe6e6a5a3dfa5e' as 'report/roster'
Merge branch 'LAE_26_STABLE' into LAE_26_PACKAGE
Squashed 'blocks/clampmail/' changes from 31653a5..c23d183

c23d183 CLAMP-598 replace deprecated deletion icon

git-subtree-dir: blocks/clampmail
git-subtree-split: c23d183c4e31f9ca2d8075b01d939e396c24bb71
Merge commit 'dbec6841bd695ac6b93881b9cb8d348889845079' into LAE_26_PACKAGE
Squashed 'blocks/quickmail/' changes from 7bd2a93..ae1f5b1

ae1f5b1 CLAMP-590 set addinstance to PREVENT on new installation
e11dde8 CLAMP-598 replace deprecated deletion icon

git-subtree-dir: blocks/quickmail
git-subtree-split: ae1f5b12af9e06a2443e641ed52f7c16dbaf9116
Merge commit '4fb51cb9b7a4175943c967c81bd6389c5dfeaaeb' into LAE_26_PACKAGE
Merge branch 'LAE_26_STABLE' into LAE_26_PACKAGE
Squashed 'grade/report/laegrader/' content from commit 9a499a8

git-subtree-dir: grade/report/laegrader
git-subtree-split: 9a499a8419c1704f379db7e27572db82d901c43e
Merge commit 'c3ddda3fd9f98bde113119aef6370285bb1e718a' as 'grade/report/laegrader'
Merge branch 'LAE_26_STABLE' into LAE_26_PACKAGE
Merge tag 'v2.6.1-LAE6.0-base' into LAE_26_PACKAGE

Moodle 2.6.1+LAE6.0-base