Git merges in Moodle 2.2.0 by Sam Hemelryk

commit 6416c6c25b56427c1157c21f5d61e04d663aa83f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 12:14:52 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30007' of git://github.com/stronk7/moodle

commit 7bebeb2a29c58a2c5c1a3ab4b92b4e57e5f9f2b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:20 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle

commit bba1338a60c1306fb3dd85fbca78d0d9c4ec4244
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:43:39 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes

commit 63a07688884ffc890a86cdfbc37eb9d4a6cb253e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 09:16:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle

commit c3f185949fd8481e0f1a41fec83c2c77fecb7c8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:44:09 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle

commit e8c3f32f83b7672cc332c4970bae25d5a058fc46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29730' of git://github.com/rwijaya/moodle

commit c9c7b8fb0b9e52bf6a9c4deefb3c2ec9c94b1f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:15:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30453-exassessment-link' of git://github.com/mudrd8mz/moodle

commit fa6765cf9c8a07fd2c6ddbbe7775318e1b03fb7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:48:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle

commit 0a9b7c2b6d781651f5bd232360c760ba984a9766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:04:37 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30440-master' of git://github.com/ankitagarwal/moodle

commit 4117b4fcd8fd46ca1000d107722118c395f9c50b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 08:02:15 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30322' of git://github.com/timhunt/moodle

commit 0c0d5011446f4e6fd13b00ba0c43eabed511dec4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:49:40 +0800
Tag:    v2.2.0-rc1

Merge commit 'FETCH_HEAd'

commit 3ddbd75accae05cfbd460ffd168e966a05414015
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:05:46 +0800
Tag:    v2.2.0-rc1

Merged branch 'MDL-30505' of git://github.com/lazydaisy/moodle.git with conflict resolution

commit fb056a811ecd0179e75d1368079cc95526589848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:56:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle

commit 9ac82391a27bbd170435c3e7a88b793f8a215463
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:52:50 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle

commit 925ae958241e34192bf488a8bea53f05ab44fe92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:46:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30273-master' of git://github.com/abgreeve/moodle

commit e343ff6a5d48b660002502256a27264d9e053a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:28:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30471' of git://github.com/lazydaisy/moodle

commit e68fa2500aaae1c25ce7649726f3e0c5e2a6def5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 10:16:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30347' of git://github.com/stronk7/moodle

commit bada16d35cf4a4e9498c545930c3886af53345f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 08:51:25 +0800
Tag:    v2.2.0-rc1

Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes

commit ac386aa92569e52d30d633e59024b5f658a4e4a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:54:49 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30448_m22_urlpar' of git://github.com/skodak/moodle

commit beb684ba11ea0b02d49df53e51dd0adf18bd3792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:21:39 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle

commit 5c0b8ea3f152a4d9e6b6eaef9e2d2586bdd114a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:13:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30467_m22_delusers' of git://github.com/skodak/moodle

commit 77da06ceb4285c8534428d0e5c4480653b0cb21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 08:13:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30422-master' of git://github.com/ankitagarwal/moodle

commit d905b69e95d675e032f4f93ce6afe1f86cb254c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:53:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle

commit 7355a8e4b7de6eb6caeb0d7871da89b77be2ce09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 25 Nov 2011 06:29:33 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-mdl-30391' of git://github.com/rajeshtaneja/moodle

commit b674092416c7c2cf0b56511a6554f634df0f581e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 11:52:08 +0800
Tag:    v2.2.0-rc1

Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle

commit b8a2a92773fc7a003b44708b9aabde6eb22f3992
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 09:11:23 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30192' of git://github.com/stronk7/moodle

commit ba54648b45b44f2f685d124dadddb714d35b523a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 08:54:26 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle

commit f2d11739a8dea0ea19c32b8c82b41f18935ed347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:41:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2

commit b2d3e5cc493c382a1836f3f7c5c0c3b75d731756
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 07:17:14 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle

commit 15415bf8e8682e618f32774496872d9de95a37f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Nov 2011 05:57:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle

commit b28de4b412c9cd37b12324749789dc97e4d6ca39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 13:26:35 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle

commit f5d0ac107758502255f165fd18f285c36cad48e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 07:59:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30392' of git://github.com/stronk7/moodle

commit 495bcb06d14e453298d209a317ba7c60e235463b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Nov 2011 05:39:02 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle

commit 919423fc6cf74ff4db96e67545296511a2f38fbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 08:32:55 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle

commit 28e6598dff156cf6edb2e675ab4f0cd6855e5c93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:48:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle

commit 67c768dbe8a9e2dff95ddd010a9f1d25ec2e7c08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:39:42 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle

commit 4f0596f874caa3a757eba951f4aea88afb377a78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:23:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle

commit 291029dfd546b934a844a9569f4155d47b8730bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 07:01:45 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle

commit 34e05996c189359c50d65ae68608887e7ef93d54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:53:45 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle

commit b8c117e1267b42ee7ef2098903d96c8067a4c209
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 06:48:47 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle

commit 7cdf3904a7c32478121429a8e9d5c894142c40f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Nov 2011 05:28:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle

commit b750c6b3884ea3ba33ffdd4040e44bf1fd8a20b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 09:53:38 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle

commit 28ab9dbe98305c69dea8758afb7251076ec9479b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Nov 2011 08:11:46 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle

commit 1ae9aa2b8f2ccb5a696378736039a24a85fb9713
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 17:01:05 +0800
Tag:    v2.2.0-beta

Merged MDL-29108 Advanced grading

commit 364fe13b11b9a668ccb36f4bdb66679ba871fb83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 12:49:47 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28670' of git://github.com/nebgor/moodle

commit 6335838604b8b13cbc0a51e299079895ca405221
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Nov 2011 07:10:17 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle

commit 025d304ad3f162018fd5ef48a021dc6813cc5b11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 11 Nov 2011 13:35:13 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

commit e3dfd1a1d96c5f60822d6a13a23e8ffa430f4b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 05:15:50 +0800
Tag:    v2.2.0-beta

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

commit 7d99144e83125433bea233c475473d9fe9529fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Nov 2011 04:41:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle

commit ee16b8af347a6704e7b3fadbb456dd99b57c8b28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:10:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle

commit 195ad02f4ab34d1665492a9c24c2d42cecb1c268
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 08:00:00 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle

commit 3e4fb0cf81b2f33aca5656d6aca99b9b565d94d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 06:58:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle

commit daa1ed26cfe4d6f6760af1dfb8b5ba9d2216c61a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Nov 2011 05:57:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30175' of git://github.com/stronk7/moodle

commit 68bcca4d04fa953581ba9e6183f465e2237ffdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 07:24:26 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle

commit a82a42b6c1bcd070c502e6a6470d5d3a3823d74f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:58:44 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle

commit 0abe89f7b4cf1ec5c028c3dd6b78b74641523607
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Nov 2011 06:41:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle

commit f94d606f1f2070725dd015a91ba6812045c96073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 12:36:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle

commit 5f3abf0a42808ad7890b4a2dac1f5dc5eba17067
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:52:02 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle

commit 6ab6630b8738ff85d87b7ab0801627c6e4510361
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:47:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29164' of git://github.com/timhunt/moodle

commit bc454be746af8e7cb5b1ad066870646e648837ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 11:11:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle

commit c189b664aed0ecfed2660de01707479993124b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 10:56:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle

commit 5a866c36345e09ea01e4912852fd4a9bb3e28a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Nov 2011 04:38:24 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle

commit 703912cd5ef20e053b5ed97d721351976ab2c798
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 13:02:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle

commit d0464f3875101c9b0bf5e379b578d7dc38029717
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:59:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle

commit 0b49b6daa75325f0c7504c2b5e14bdda99afc03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:28:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle

commit 5e255d5ad86a980411320ca5c63c4e96e278da27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:18:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27919' of git://github.com/jamiepratt/moodle

commit 243e3dd130adfdb0cd89349498c494403191de68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 12:11:08 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29810' of git://github.com/bostelm/moodle

commit 1fe368530fda98210159d11c2781d50833af5c7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 11:53:24 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29994' of git://github.com/stronk7/moodle

commit 70f43a4789065b158860bc4a649ef74dca229514
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 10:19:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29993' of git://github.com/stronk7/moodle

commit 01dc193786384ca54031397e5e481441fa4442a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 09:56:06 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29992' of git://github.com/stronk7/moodle

commit a6d832f022019e9abccad0d58041bef87d5f6bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:51:07 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29978' of git://github.com/stronk7/moodle

commit cdf30a11a8ed7f117dd65939492a19fd4363aa18
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 08:06:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle

commit 81ad059658dd525ed65f92a1e64354cdcfdaac0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:59:35 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle

commit 75dab90e3df85a1cafe2b7a52bccf7099b57d150
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:55:57 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle

commit ad7592f32bdabfd158d16d69d072987086fdc726
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:47:21 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle

commit 385f30f7a77a886a91d7f4394115ebd13b322c1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 31 Oct 2011 07:44:05 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle

commit 7b27861217bea48b796f9f39ce1b2ea0411b1f28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 27 Oct 2011 07:57:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29912' of git://github.com/stronk7/moodle

commit e6369d951c9b724a61003e95a0f5c8a5001ab6a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:44:41 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle

commit 462a064cf08143dbf62ad4327209630f8b8776de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Oct 2011 05:21:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle

commit 1c3bd9b3ff8278c4540122d7b6f980803b62bc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 11:47:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28718' of git://github.com/timhunt/moodle

commit d040ea889319a657a5ffb9eac38ea957dfa9400c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 10:19:45 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle

commit 6327bf8f2badd558faf80b20705a733bcfa0d20f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:28:53 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle

commit 44d10ad002096029a058e8b2b632621aa66d6d02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 09:02:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle

commit 9d9d8e17ebe41979a55460380cee75e1c3ea7d9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 08:10:43 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle

commit 6f59dd1a8bc2f7c191e44b66df4d085c5d02ad62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 07:25:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29906' of git://github.com/timhunt/moodle

commit 9c99c3df4658ca682c752bd916747302283a8c66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:49:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle

commit 2d9408446373fb6e9e7a2defb072bd9099036611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:46:51 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle

commit c486d7f2d84d0fb9029c94d3e3e9706207dbb828
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:45:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle

commit b8b594843c14044d8efa4484300756e707f0d149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Oct 2011 06:42:40 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29106' of git://github.com/mouneyrac/moodle

commit f856216cb1b2699c18c654ed692afc14aae4c2bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 09:31:34 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution

commit 4f50a62635346d6883206a6ab057eda4c7bde321
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Oct 2011 06:38:26 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29501-master' of git://github.com/sammarshallou/moodle

commit ff90023b006b1c55915027e92fc4d971e1a38b52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 13:52:23 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28170' of git://github.com/stronk7/moodle

commit 22ca670f88c1de351b0043e81141663eec208119
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:37:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle

commit 5f6de5dc6b3f558cf8db9cadd9b3384f20704688
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:31:52 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle

commit d97505d2a344df0934972521464cdd123a3dd047
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 12:28:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle

commit a6ec1940c841dbfad14a738ea7f7bbc3b9b15afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 11:25:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle

commit f7e8e43f2d864767927f9b3ccc8792379579302d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 10:21:45 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle

commit b55853ff63c71722134245627cb10469a8423781
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:54:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle

commit 92fe97f922c2f03496b54f7f171ab4f1b9db1cd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 08:18:30 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements

commit 629aa44873c4546ecab97d257434be14a3db0e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Oct 2011 06:07:25 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle

commit d87ef085986d1d5e7e6022b256eb9b41cb99be8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:25:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29447' of git://github.com/timhunt/moodle

commit 811cbdcfbf76bfb5c1467185e33ad728abe7a5c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Oct 2011 05:15:46 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle

commit 1216ab39d1377eb6ec21897f0f1bedf3a0488c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 12:56:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-16553' of git://github.com/bostelm/moodle

commit 3070626a748245340f4942d7d84676116a76dd2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:20:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w40_MDL-29686_m2_yuicaching' of git://github.com/skodak/moodle

commit 77b93da537e86a7001c8f4d6e09172439bd936cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:09:34 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29668' of git://github.com/stronk7/moodle

commit 36a42c57d103856ea7fabd291137f540674b86f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 07:03:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29677' of git://github.com/stronk7/moodle

commit f915430855c73baeb2f117dfdab9dece2196a6f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Oct 2011 06:24:44 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle

commit 0870a0689971395b31ce99c7208b9a72e21176b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 12:54:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle

commit 2bbe5979cbe56de1deff2f86fcc550527a25105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 11:21:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle

commit 66d216c574781db4c9043c4817272559cd7b9924
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Oct 2011 10:52:57 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-25937-disableif' of git://github.com/rajeshtaneja/moodle

commit 1bbe222d530378956a1c0701158a429250a9fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 12:08:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle

commit 324e62047425c290372a73c73fdc69c5d43a37be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 11:41:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29605' of git://github.com/lazydaisy/moodle

commit 006debe5e4c8b98b8640819f59609c6b0f52724b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 10:09:17 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-29539' of git://github.com/rajeshtaneja/moodle

commit 2c66ceeaef935fdb98904ecdc1b9cc07be420b27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:37:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28566' of git://github.com/lazydaisy/moodle

commit 3a2abe2e6ebb0c7ff21f44e86f47c67f8882132c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:29:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29323' of git://github.com/lazydaisy/moodle

commit 49ebdaf1da1299e8550fc8c2a22694842f97f294
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:24:38 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-25454-master' of git://github.com/marinaglancy/moodle

commit 9ea1b97fa424c4e5bfd307efcd8c2f9abb932955
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 09:01:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29558' of git://github.com/jamiepratt/moodle

commit ef6380f0429d24f0d314592b991a1ecf132b1ab8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:29:26 +0800
Tag:    v2.2.0-beta

Merge commit 'FETCH_HEAd'

commit 1efd3fc8e73ac0db3a6ac35b5800d1a6dd8473d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 08:23:01 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29567' of git://github.com/stronk7/moodle

commit dcde0e9389391817ec4ec5be592f83be6d10fcc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:49:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29566' of git://github.com/stronk7/moodle

commit 9209bcfbb10047422e8ec9329b431e1c121578bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:27:11 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29618' of git://github.com/stronk7/moodle

commit e06ae159ff5147498db67d5101d6739f216825b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:24:40 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29612' of git://github.com/stronk7/moodle.git with typo cleanup

commit dc39771b01fac887afa47165a9ed9a28e6a8ccea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 07:02:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29611' of git://github.com/stronk7/moodle

commit 9afd0b3e2e67b4513535d7c39fa00115dd52691e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Oct 2011 06:51:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle

commit f08d258cd4a3a0d2b4e07c8100b7d2abeb1e58ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 09:09:18 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-29519' of git://github.com/danmarsden/moodle

commit 87eca3192f78993e9bbe2ccd241ae289cca4600d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Sep 2011 06:24:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes

commit 32da08a2e269118a47350fe256d263af83859373
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 09:03:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29428' of git://github.com/timhunt/moodle

commit aa856c79994d0e82aa4126c825ef082284da929d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:53:17 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29484' of git://github.com/timhunt/moodle

commit 98182d2bb6a9359a04bd51ef5a7bdb44e1b7b8d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:50:36 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29492' of git://github.com/timhunt/moodle

commit 663a12c32e1bb0659a8e87277c0d402878421782
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 08:47:41 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29493' of git://github.com/timhunt/moodle

commit 6ef900d20bead28c4685c817fcd0a632c6a4dabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:55:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29416' of git://github.com/stronk7/moodle

commit 809dae3461f004cde6fafcc414c745163649d96c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 07:37:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29336-numerrors-mapping' of git://github.com/mudrd8mz/moodle

commit 0ebe6764e9666cbd5dd8732eef6ed1b10cd8e2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:52:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29478' of git://github.com/stronk7/moodle

commit fea98bd4c37b3641a417f5dbda6b126ef25930df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:46:39 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29139' of git://github.com/nebgor/moodle

commit 9d0fc907e8e01ec1bb3e865af1ae097b5ce70be8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Sep 2011 05:38:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29190_master_wip' of git://github.com/grabs/moodle

commit 609ad0da5bae152ee0a35fa3b2ed47574caa64ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Sep 2011 13:52:53 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26635' of git://github.com/mouneyrac/moodle

commit 436cfb8bb76527b1e5b0683d2a09d6baedac7bad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 08:14:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26841' of git://github.com/stronk7/moodle

commit 7d6e26b49b8144c92d8ecdd1328bb88a5444e0f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Sep 2011 07:58:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29392' of git://github.com/timhunt/moodle

commit 4cc14ab11edd7319896cba4f49a1128a33243563
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 15:19:42 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29366' of git://github.com/timhunt/moodle

commit 0910764ff3a209df2b06029a34d9c0128bba965d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 14:36:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28329' of git://github.com/timhunt/moodle

commit 931f89cc13e16088a760ee0eb7d9d554ded5a4b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 13:01:00 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-25937' of git://github.com/rajeshtaneja/moodle

commit 668dae632aa64c92720e3b43daf5ab9f8dc82f7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 10:26:58 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle

commit cb2c93c8db2ce107a8f093c8b1626b8fceb3fcb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 09:32:37 +0800
Tag:    v2.2.0-beta

Merge branch 'w37_MDL-29406_m22_configdelete' of git://github.com/skodak/moodle

commit 7e0b7fe7cf9ad040c6adc937f34561cab10cfaf8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:56:34 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29360' of git://github.com/timhunt/moodle

commit 76ecaa10749fb42c4034630d1519d7adf4118526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:40:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28259' of git://github.com/timhunt/moodle

commit 2b834a1d06606a43b548a1f4ff3370cbd4650598
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Sep 2011 07:15:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29415' of git://github.com/stronk7/moodle

commit 4bc844f770a13b41c1e81bb3311a73d46424ef47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 11:34:03 +0800
Tag:    v2.2.0-beta

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/moodle with changes

commit 62b214d9a6f036c620cbed4dccecc804f3419376
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Sep 2011 08:45:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

commit 32ec60d142b21967464731eb5456e192a29ce20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 16:18:27 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

commit 9f768d6e5fa1d3d8c0e3a4cd141616d487fb46c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 15:48:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle

commit f8adfe6cc0be02bc469918b87a142c11581b241b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 14:26:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-28701_m22_tempcachedir' of git://github.com/skodak/moodle

commit eb3d2faaa1fa85741b50f48540c6c21c0baba68c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:48:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29025_m22_verboseauthdb' of git://github.com/skodak/moodle

commit 16ff2aee7dbc4799e534277fde524835ac420676
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:24:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28724' of git://github.com/nebgor/moodle

commit 5da0e7fc03d8ef0e9be6c453dfe88a51a6d57af0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 13:08:27 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29131_m22_recentsep' of git://github.com/skodak/moodle

commit 5b4404f615d0f30929bcaf625ab76186fd696eab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:52:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29175_m22_clozearray' of git://github.com/skodak/moodle

commit 8d6540ffd17a5f6098ec80c0d7e9385103c6d972
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 12:30:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle

commit b13dbc43d763c37a7458fe71793f17e88deeb179
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:30:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle

commit 8b5bab6f91b42ab537503bafe27eeb7ddac7ef63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 11:17:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle

commit 633a5edd515f6d80e61bbef0e3cb57bd8333a84b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 10:38:45 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27635' of git://github.com/rwijaya/moodle

commit 342e97ee9c23e632b78223a9ee6a26463d47c200
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:42:28 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle

commit 0eac94dfc7991ff2fa2c84d8d04d735f906fbe24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:19:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28488' of git://github.com/stronk7/moodle

commit 014d3c1f8d1de8d74f541dd637c12c9cd4e82161
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Sep 2011 09:09:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29269' of git://github.com/stronk7/moodle

commit e824388a1c34085a63cac6ef617c403186cca8cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 15:23:07 +0800
Tag:    v2.2.0-beta

Merge branch 'w35_MDL-29233_m22_usersel' of git://github.com/skodak/moodle

commit ae4d8567b4b74b85b25f72141e773bbbf3e79a8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:08:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29018' of git://github.com/rwijaya/moodle

commit 0d966d5bfe146fd6a88997d8801e2fd93119467d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 12:03:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28689' of git://github.com/rwijaya/moodle

commit 15f3ba7e78bf0ee97cdc16995f74c9f1920c5914
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:41:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29072' of git://github.com/bostelm/moodle

commit 3dc1b595ef8cc16fd505088d05fcac1b0a65eb6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 09:36:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27975' of git://github.com/rwijaya/moodle

commit 057c2f8d06d51e1c0bde7195c88127cf7de8a48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Sep 2011 07:12:10 +0800
Tag:    v2.2.0-beta

Merge branch 's13_MDL-29170_risklevel_master' of git://github.com/dongsheng/moodle

commit 239ed133f12bb6e7aad1cfdd7df1c93dc88f127a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Aug 2011 07:03:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle

commit 1e31393dba01307b35c4c5ecb9a4269aa1889550
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:58:05 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28564' of git://github.com/timhunt/moodle

commit e57bbf55abe82347eddc36c273d9587d340c8d2d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 09:05:00 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26819' of git://github.com/stronk7/moodle

commit c4b06ddd7549d9a273bb54dc4be1a5a247b5875b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:53:51 +0800
Tag:    v2.2.0-beta

Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle

commit c873eb4a90f21cf6b8bd897724d48738539bc32a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:23:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29135-mnet-login' of git://github.com/mudrd8mz/moodle

commit 1924a86afaeca2ea4a60a563250c1a32e6579c03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 08:13:40 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

commit 95d0c74474e7112d7e0cf9720df1bc3de956714b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Aug 2011 07:11:10 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/moodle

commit 92636dfb5a77be259e75a92ef8cfd8ef84b67e7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 14:04:22 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle

commit 751a6d3c29a9b8276155253a831fca4c0648ef17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Aug 2011 13:39:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle

commit 01352e33ccf22779dcc8dd9c405bc643a9052ae9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 15:05:56 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle

commit e97584bcf1075485fa043d28830fc97cc6f17001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 14:22:51 +0800
Tag:    v2.2.0-beta

Merge branch 'mdl-28517' of git://github.com/colchambers/moodle

commit 0d38abcf38a09e8bc28ac0b7cac700589e75aad4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:58:10 +0800
Tag:    v2.2.0-beta

Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution

commit 9e4b5b45a497cc251a27febda31599d640eb35ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 13:43:42 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle

commit a3ff929807af559c20bcacd3a686ba688b86736b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:18:14 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle

commit 16c009c5bf8dd53aa8628d09e6f8de33854da6b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:06:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28602' of git://github.com/timhunt/moodle

commit 067b8a555627240995029bdaf4c2be0c34bee4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:04:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28593' of git://github.com/timhunt/moodle

commit 9d85b62c42d16a27b4500e054fbcf934080da811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 11:00:38 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28612' of git://github.com/timhunt/moodle

commit 2f86bcfffa03f68dccef26a07fde5de2779f92af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:57:11 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28618' of git://github.com/timhunt/moodle

commit b1251c9008d422878e53174c9fcac002e1690dd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:46:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle

commit cb09753feb3bf141003f9baaf1289ab6750ee90e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:26:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle

commit 9be161c678f1c80ebcee2744fad6721c0f1e5a4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:20:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle

commit 7d85a4e2269736010afb46208836f1ad1e7e7f99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:16:23 +0800
Tag:    v2.2.0-beta

Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements

commit 3b8502658f5dac34b716352a920a3d010d6948f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:09:31 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle

commit 406bf830cde1d3f0c2d5081c301595f436ad9e1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 10:06:06 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle

commit 7d405fe7c8c8ad411a53e553adbd463f6c6636d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:59:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle

commit 639ab4d5c58f4b73c4102c56de10627be9b75ca9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:57:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle

commit c357b5c6e0e3c203351d18124ee541a06281f7a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Aug 2011 09:50:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle

commit 948ef5d07aa3c89a34a65173eaf399324149ec60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Aug 2011 15:03:30 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle

commit 44506b87dc427eadb0456dd603574bd82ced0888
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:55:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28490' of git://github.com/timhunt/moodle

commit 58e67f7f1a36d5a0bc6292f19b1f23ae71efaec3
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:48:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28508' of git://github.com/timhunt/moodle

commit 87573744e6e26d9c9b3e95c629cd2fe27f2fa16d
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:14:04 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28051' of git://github.com/timhunt/moodle

commit 1eaeb5d89ed195e1110cd3d318a2cf3bdb6948ab
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 17:06:56 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28515' of git://git.luns.net.uk/moodle

commit 6b50af32d66ae1e6ca2d8f6086cb6f23a47eaf1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:59:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis/moodle

commit a338b06243e7da8f4edde537a207bc7af354e8a9
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:50:58 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-28504' of git://github.com/rajeshtaneja/moodle

commit fef0f0e79399ceae0475a0b695bfbef45e2fb301
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:46:39 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-19907-master' of git://github.com/marinaglancy/moodle

commit 8a5d0e95b3311f94007ba72702a5f78ef10528af
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 16:19:08 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27122-master' of git://github.com/marinaglancy/moodle

commit 5867cf50475886e250cc25cf00acc03b40671afa
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 14:08:31 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle

commit 223b96e0fd8f3f50510146a56af7477fac8879f0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 13:42:44 +0800
Tag:    v2.2.0-beta

Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng/moodle

commit 16321a2bef3827187425ac709799609160590d73
Author: unknown <SamandJen1@.(none)>
Date:   Tue, 02 Aug 2011 13:25:44 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-27876' of git://github.com/danmarsden/moodle

commit dee43df740e057a419382fd477882f1943173270
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:22:29 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28487-typo' of git://github.com/mudrd8mz/moodle

commit 2f783d93d5ca0bbed5d9bda012a90f1674917d1b
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Tue, 02 Aug 2011 12:02:52 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-28493' of git://github.com/danmarsden/moodle

commit e832dfec60694d86ad369d51c3c452876bf8d814
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 29 Jul 2011 10:13:57 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9e4d53c7e8d6d2fc70e882ac9b07f9a83d1b096e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:37:05 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28441_m22_scromreport' of git://github.com/skodak/moodle

commit 39c621f63b5b7ff4a4a243c34a7828b310005cda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 15:14:12 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28107' of git://github.com/rwijaya/moodle

commit 6c193bff68901b05cdfea5a426bbc02824f1aa24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:18:21 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-22584_m22_monsterpaths' of git://github.com/skodak/moodle

commit 00d8d33cdc68e157fb36883634bec3116cb86c41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:08:26 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-25699_m22_installcss' of git://github.com/skodak/moodle

commit 9192b4537c7994d81b018f507a2709a13f68da2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:03:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27464_m22_continue' of git://github.com/skodak/moodle

commit 7fe0effd0036ac7277c58984d454075bc5be4228
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:59:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27653_m22_usercasting' of git://github.com/skodak/moodle

commit b039eeb82bf507ada9c4718fed9931cebd095fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:54:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27796_m22_httphost' of git://github.com/skodak/moodle

commit 0e7f782eb4242d68a94691616a187c06c24dd792
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:45:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle

commit 1092bd6db43b21f321541fbaa9c2ec8f6bf0e1c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:39:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28145_m22_renderer' of git://github.com/skodak/moodle

commit e826ef51b2dd94e9fcf456c8dd70dfaaf04e1dc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:36:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28182_m22_userdel' of git://github.com/skodak/moodle

commit 7443fae6a5bc73dd3f6c870a475cddf326f4a8c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:29:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28337_m22_urlparams' of git://github.com/skodak/moodle

commit 1f70ee662ef5bd02763f6d548d82a48dfea167ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:14:29 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28384_m22_nullurl' of git://github.com/skodak/moodle

commit 94ffa4a183c61ddebcc40661256334c350682eac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:02:16 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle

commit 8306a3799ef4a05aa709bca8aa829b2f3ca8d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:52:33 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28432_m22_cohortconfig' of git://github.com/skodak/moodle

commit 08ad288d6f9081e8e28e5ce321cf3cfe7e931b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:44:25 +0800
Tag:    v2.2.0-beta

Merge branch 'w29_MDL-28440_m22_jssemicol' of git://github.com/skodak/moodle

commit 310758d65534dc168dec1a427ec29f05d11d68ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 09:39:31 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle

commit 610cc5c3838433d504b969e27be5811b59780ece
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:45:13 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle

commit 761a000f7353aaf9d8f4c60d9943e85549ffc212
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:39:02 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle

commit 508a5bd402a528f8f9375631a92823c8559454d6
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:34:37 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle

commit 5f65d37cd276982a25ac8090b2602a69a48d155c
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 22:25:13 +0800
Tag:    v2.2.0-beta

Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git

commit c1d251e890b048025347ece0137ac3be16db19d4
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 20:15:55 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle

commit a4c3145984912f7d57dff6328d7558a1b6aca1a0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:50:50 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle

commit 0704038e41b3e8f47f52e30f6053d9fc381b63bc
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:16:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle

commit cc4db9d3c1a264f20f015280e5059bc338194979
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 19:03:22 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle

commit c5fe313c0689f207004a22286c061c15072c60ae
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:25:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle

commit ce4a587308f84e885e67b668777f2bc9ef9e2dd8
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:17:51 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle

commit b96fa1c265ea7db6b9cb86ba304e4dd7edb2bf86
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:08:36 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle

commit 50a3053e62554be70f165301b7d43b7cfdf505ba
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 18:01:08 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle

commit 47fa86b30684db1d4efadf8e56298b9ead02ee5e
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:47:59 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle

commit 5576c64139ad7756bb5cccd72f00b7ae1111c229
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:37:49 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle

commit 1eff23084ed3e369f43f4e79c708442187d98f27
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:27:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle

commit 59c8535226d3f2bd62c4577a14ed92cb210de1a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jul 2011 20:06:16 +0800
Tag:    v2.2.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 9c52c8a4b0a5a0e5a9980688ee9e896f5698e673
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:20:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

commit e2d1b25a5a65c690a2e619fd08c192fcd0ccd8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:11:50 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle

commit 59772e47497192e6bf4895cdab391fb29d08a658
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 16:01:26 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle

commit 9dae5179cb40dbf4458e3fe317f0bb5c6e8a1fef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:40:12 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle

commit c430467ca836333775d5568a9b01cec75f5bb473
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 15:02:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28195' of git://github.com/timhunt/moodle

commit 48ae99cbaf2c0b1f1b166892da23468c3793fc47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:50:56 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle

commit 3bbc7a0fc518e7874a6a40ca9d71b884c0bf4532
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 14:18:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle

commit 42afcc172a426034914a84530dca1b1f64c227ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:54:49 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle

commit c9d0d331743ca36c2c4c0f21f27a1a71c831e9b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:25:44 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28268' of git://github.com/timhunt/moodle

commit ed21851b3c895473471d631b80ffd0d1cc4df950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:17:52 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28192' of git://github.com/timhunt/moodle

commit 7a5c6b98e143ee682e1499c543eed3bf4e208d68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:31:13 +0800
Tag:    v2.2.0-beta

Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle

commit 08d29fb18dd1e9a7d25b31fef934926bade55d98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:25:21 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle

commit f7776c0fc865683da4cf76a22aedc47691f55118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:14:44 +0800
Tag:    v2.2.0-beta

Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle

commit c75d584dccd4cfd6c4e40b1a5a8e32c2e08b1d52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 11:02:41 +0800
Tag:    v2.2.0-beta

Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle

commit 8b6c283f948b0c3d7f0debff6a021cc1c0ccaa8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 10:53:38 +0800
Tag:    v2.2.0-beta

Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle

commit 8f49f9ce8e655b221626031520e824ae458754bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:24:47 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle

commit 50c1cb0394dba63d33daee22fd0957bb06d03489
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 13:17:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle

commit 024ad4bd826e93ef212d959d1d3b635aa66e1f83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:03:33 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle

commit 1a3c5d23662dad8d714b248787fe451ec4d4c9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:19:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

commit 8323432992de4e0c20f32b86b1412deec07adaaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 11:06:20 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle

commit 5b966cbb3ba1fbdeeeab00d2c0fb2204bd55c7aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 10:53:48 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28135' of git://github.com/nebgor/moodle

commit ee992c6c666eedb7783f800a8a0c672e1c205e1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Jul 2011 16:51:49 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle