Merge commit '26d040cb48b3b17e730985a773e87b97cdd9e8b2' as 'blocks/quickmail'
Squashed 'blocks/quickmail/' content from commit 16c5802

git-subtree-dir: blocks/quickmail
git-subtree-split: 16c5802efdf7059e727caa6665cf7c7662bdcd26
Merge commit '35336bed84229ab26a9f9b776c4749443b9c3f59' as 'blocks/filtered_course_list'
Squashed 'blocks/filtered_course_list/' content from commit 685ce53

git-subtree-dir: blocks/filtered_course_list
git-subtree-split: 685ce538d749ed6f58a3e68f2e4d64a0ac2c428b
Squashed 'report/editdates/' content from commit 5ea65e7

git-subtree-dir: report/editdates
git-subtree-split: 5ea65e7e2ca75462d96154191231483b1c315385
Merge commit '0795d769c70304d892ceb48f94398eca9fcb2af5' as 'report/editdates'
Squashed 'grade/report/laegrader/' content from commit 5df83c3

git-subtree-dir: grade/report/laegrader
git-subtree-split: 5df83c37fe66f4aff051005b289f9f5e3a461f6a
Merge commit '76a2903233457703413128ef9539787084998a00' as 'grade/report/laegrader'
Merge commit '588d535f500e3da86d4fd5eb4bcb3a4a406d29d3' into LAE_25_PACKAGE
Squashed 'blocks/filtered_course_list/' changes from 685ce53..bfa03b0

bfa03b0 CLAMP-530 compatibility with Moodle 2.5

git-subtree-dir: blocks/filtered_course_list
git-subtree-split: bfa03b03d1b5fc81366b4ec2f6a1cb149b543a1e
Squashed 'report/roster/' content from commit 82d2786

git-subtree-dir: report/roster
git-subtree-split: 82d278620dc5ce3ef034ad7d9e429b2d745ef4d2
Merge commit '36ef25249759dc652058e6115b918c4fbfcec80a' as 'report/roster'
Merge branch 'LAE_25_STABLE' into LAE_25_PACKAGE
Merge commit '4c7e1e18007b2156ef21947ab75514313d88b3f7' into LAE_25_PACKAGE
Squashed 'blocks/quickmail/' changes from 16c5802..649f6a6

649f6a6 CLAMP-375 Quickmail: do not zip if only one file attached

git-subtree-dir: blocks/quickmail
git-subtree-split: 649f6a6a52deb0f98e7be44871ef36c0fdd2ea39
Merge branch 'LAE_25_STABLE' into LAE_25_PACKAGE
Squashed 'blocks/filtered_course_list/' changes from bfa03b0..d67357f

d67357f CLAMP-552 add missing language string

git-subtree-dir: blocks/filtered_course_list
git-subtree-split: d67357f83003ba1128df8da8a7c0549d6ddc9f6e
Merge commit '09729f48ef66bf2eca038bcfaeaea2674619b101' into LAE_25_PACKAGE
Squashed 'blocks/quickmail/' changes from 649f6a6..3211895

3211895 CLAMP-555 Compatibility with Moodle 2.4 role handling
01dcec1 Quickmail v2.0.1 (CLAMP)
04d3e85 CLAMP-553 add missing language string
49bc123 CLAMP-554 remove redundant role filtering

git-subtree-dir: blocks/quickmail
git-subtree-split: 32118958b854b052f8f8ab22271825c26123a4d9
Merge commit 'bb9a9bad626bfa32a719a541f8405867f837adf3' into LAE_25_PACKAGE