Git merges in Moodle 2.2.2 by Eloy Lafuente (stronk7)

commit 5f51b09aeca6b25d451eba4fafd8645a8e8bcfd6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:56:33 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 9be61d94fd29b43ed2ae11b84b7520a930ab2518
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 18:04:06 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit c44c8eb96ba872907d90ef20ee1012fe967eb206
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:46:35 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31248-MOODLE_22_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 1312ff87403b63bdf3e22e4f9ce978d6496020ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 09:28:41 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31248-MOODLE_22_STABLE-v2' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 26158557130f602ef49560bc5c6f17369d30de31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Mar 2012 07:48:22 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-29086-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit c904abc752eda4093d235c6732491157b8770273
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 22:40:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-31712_M22' of git://github.com/kordan/moodle into MOODLE_22_STABLE

commit 5da8f5d11ea88f8af6a9cc3270ba52980d011232
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 11:01:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-28364_22' of git://github.com/jonof/moodle into MOODLE_22_STABLE

commit a9b03dc66185ee727d800865e3519fb9d2632a80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 07 Mar 2012 04:23:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-31829_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit fc7776f50ac23c8d0540d07470d0a39df350d73f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Mar 2012 20:11:41 +0800
Tag:    v2.2.2

Merge branch 'w10_MDL-31785_m22_htmlpurifier' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e8681669bc11d37bf06c7ad985c1cc0567badd9d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Mar 2012 18:26:02 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit f2a6db61a9969ac41fec91c5acee395fdca4f6c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:19:19 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-29274-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 3716fb55e103697caacda4cd3db4fc33a4b5d0bc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:10:48 +0800
Tag:    v2.2.2

Merge branch 'MDL-31748_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit cafbb73f5b8773877cd6e077e626d6a931772398
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 09:06:07 +0800
Tag:    v2.2.2

Merge branch 'MDL-26496_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit 46ccd8b12bc44b56b01d64fb386fffb27146413d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 07:30:27 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31738-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE

commit 313f98c88a72d6a37eb34dbfde6dbabe3c820b47
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Feb 2012 00:34:12 +0800
Tag:    v2.2.2

Merge branch 'MDL-25027_stable_consistency_fix_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit e61fabb720bc6a01e775a1bacfbed0ad41cb475b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 10:52:53 +0800
Tag:    v2.2.2

Merge branch 'MDL-27793_m22' of git://github.com/nebgor/moodle into MOODLE_22_STABLE

commit aaa24bb35cb710a590b24baa8735fbf833a56784
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:21:50 +0800
Tag:    v2.2.2

Merge branch 'MDL-29161_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0c93bbde9e9bc843e4e50774eed69731ee51b9b8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 05:06:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-31721_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit bd4b665ed6e03d9523d2ae295dcbff4c9ed2bf60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 02:02:42 +0800
Tag:    v2.2.2

Merge branch 'MDL-31729_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit edb03ff65b5afc63fce275bb9a30fd2297470ef7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:54:35 +0800
Tag:    v2.2.2

Merge branch 'MDL-29256-resource-format_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 98e9b0f21e4213fee4a3e3aad2e4318ca6444ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 01:47:51 +0800
Tag:    v2.2.2

Merge branch 'MDL-29199' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 515acf79147b12047a17b24e72064b2d0b221cfe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Feb 2012 00:07:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-29229' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 1415ba23190eb52e1215727d8be084104dfda019
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:51:54 +0800
Tag:    v2.2.2

Merge branch 'MDL-29523' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit bcf5427193a638d60214ef9bcdbb404581a31258
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 23:06:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-29592' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 0d40a799e5d090f6f22069705fadb97d385459a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:57:09 +0800
Tag:    v2.2.2

Merge branch 'MDL-31348' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 5775c7ec63554a329056437b195e589d5af55b32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Feb 2012 22:44:28 +0800
Tag:    v2.2.2

Merge branch 'MDL-31546' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 17d8e3ec8a824db75102b10b64d3a23771904ccd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 23 Feb 2012 18:34:52 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 7b1890513f0ed446bffad43b644787a46e4b60a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Feb 2012 04:19:33 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30830-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 52f37a943c804be88b3b30836e4ad71c803984e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 17:48:20 +0800
Tag:    v2.2.2

Merge branch '22_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE

commit 894c5e0b86065428d1f296a3dcd6628880727301
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Feb 2012 09:10:29 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-25432-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 9b228afffe62ff7c5182bbfdfa323ed799654d80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 22:40:02 +0800
Tag:    v2.2.2

Merge branch 'MDL-31345_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit f24d063a5e916cedcf9be9683cf27d90e2682d81
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Feb 2012 19:59:11 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-25299-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit cad211198a3115d35facf818257cb1066e44e552
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 17 Feb 2012 08:43:38 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 32d4d0d1ce791b7ff6c83eb96cf7ac6965584e51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 14 Feb 2012 20:12:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-30126-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit a72cf89d5ef25d77261bd6efd4f4a15c545d825a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 13 Feb 2012 08:14:51 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 948a4d8c941a2f4de9183fc6c2484db4566a1cf5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:44:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-27891-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 2ffd822e63c13c2dcb73f200021e2581694de51f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 18:17:26 +0800
Tag:    v2.2.2

Merge branch 'MDL-31345_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit 47475df5274828e831de13d48a0d9f56c8ef0979
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 10:38:44 +0800
Tag:    v2.2.2

Merge branch 'MDL-29892_overview_hidden_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 76456cf5f247a75715317bba3bc6a24e6253a94b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 09:37:46 +0800
Tag:    v2.2.2

Merge branch 'MDL-30722_forum_unsubscribe_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 6fe3c3907b9fc55c822f4e9fd3c6336717946fff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 08:18:09 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-30540-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

commit 16f5ffacd44afbf490122c8bacb6b8fc2980568a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 07:53:15 +0800
Tag:    v2.2.2

Merge branch 'MDL-26384-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit c2db2793d20c116cd78188869a3d306373200306
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 06:49:19 +0800
Tag:    v2.2.2

Merge branch 'MDL-27360-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 357274c6b9936aa89ae3a89c73099759401984a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Feb 2012 05:41:39 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 18a727e6fd9d281384b9041cd0877a0cabafbf5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 02 Feb 2012 19:08:48 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit be15c303e0e868cf84e43a77fc124c3c39ebe24f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:54:14 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31160-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit acef9e8a7f2ac3133aefc806c47db35cfc114cc5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:50:38 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31197-m22' of git://github.com/samhemelryk/moodle into MOODLE_22_STABLE

commit 6badc27a661aa0f5ca8ff9f8eddd3ca12ca25319
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 07:41:47 +0800
Tag:    v2.2.2

Merge branch 'm22_MDL-31039' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit f22c2e015a1d63e6d683d7f8d4e6f25a28bdf7e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 06:02:56 +0800
Tag:    v2.2.2

Merge branch 'MDL-31015-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit d4184875ce9ecc5720be113a56a4dd7b982ef3d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 02:38:48 +0800
Tag:    v2.2.2

Merge branch 'MDL-30854_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 26be1bf17a3f608712759724283c592554c972fd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:16:51 +0800
Tag:    v2.2.2

Merge branch 'MDL-30484_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 5a1e6f2a6c4545a46de66dfb4d69a9d08bea55df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 01 Feb 2012 00:06:14 +0800
Tag:    v2.2.2

Merge branch 'MDL-31314_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 61622d9709ee101c6a5440c92df3d38cce6dad25
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 27 Jan 2012 09:20:16 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit b292cea475d1d0a3a2b7dbf67cd56782b14f0230
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:52:36 +0800
Tag:    v2.2.2

Merge branch 'MDL-31122-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit fe3130a07d05c43df7c1b7dd7de6de052f16471d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:17:06 +0800
Tag:    v2.2.2

Merge branch 'MDL-29896-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit 264189da87a0bde3a7acb66fc9d3d2a8bb423215
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 08:06:56 +0800
Tag:    v2.2.2

Merge branch 'MDL-31113_multiple_files_file_manager_22' of https://github.com/davosmith/moodle into MOODLE_22_STABLE

commit 9e3824a63dbabe368a8f3fddc7a36d9ad971b4c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 25 Jan 2012 06:55:36 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31238_m22_php54' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ba09a2619e74b3ebe0dc58d5b22196c7f5bc9cbc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 19:25:55 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31183_m22_gloscounts' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit ac2a99b1b8809061a0ee1d08981a3ee177c18bde
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 08:30:02 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31176_m22_groupcontext' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 2581c3cb7012253496cd7cedcc3c90783f223b33
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 07:09:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-30033_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit b19a440a04f103697d53ac03590cdca185d1e45e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 24 Jan 2012 07:07:06 +0800
Tag:    v2.2.2

Merge branch 'MDL-31065_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 7ce803eeaee5624785f4dfc199af9697c86ca721
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 08:19:45 +0800
Tag:    v2.2.2

Merge branch 'wip-MDL-31179-MOODLE_22_STABLE' of github.com:marinaglancy/moodle into MOODLE_22_STABLE

commit ed6af81b5048b2e5e9d53ec8e34515d5ab8d3714
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 08:04:17 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31181_m22_fitlertestcfg' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9e2f7486690d621a0da82796feeb34f9318fcaa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 07:56:24 +0800
Tag:    v2.2.2

Merge branch 'MDL-31058_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6daa6285cc04f466ee9bda53a83722fdc58c7fe5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 23 Jan 2012 07:28:28 +0800
Tag:    v2.2.2

Merge branch 'w04_MDL-31185_m22_postscfg' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 4a4c146e9f6388f3654d7d83b38385f7b842d258
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 19 Jan 2012 20:28:42 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 2aa4f06a884404293e274ea03428b2e857101578
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 19:37:28 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31213_m22_attributesmess' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 14a49d6d28a9ea216491bf8bf3a06b72448329dc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 09:26:25 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31053_m22_contextpreloading' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit b837c9e84dc23764913f3c5f7f72dc4c6944f0c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 09:11:36 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31127_m22_switchaccessinit' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 8838b16705a52f22df060ebadeb949a4d92e2df8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 09:06:06 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31161_m22_reqpluginnotice' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e4715ab74aba3edef0c682703c1cccffee2b323d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 09:01:49 +0800
Tag:    v2.2.2

Merge branch 'MDL-31080_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 87be88ad2f54ba1f7e98958a1bf703775066ffb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 08:39:07 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31142_m22_slowiconv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 27dd6a7c5731fc58984bc95a23b30d54f9a1779c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 08:32:17 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31171_m22_blogattachment' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 9690f664474841236a44b3b0a02c3e2f56dfedc3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 07:55:45 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31170_m22_blogblocks' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit e09cfa968b4578cbfe967f72aca71d613337bad4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 Jan 2012 09:06:57 +0800
Tag:    v2.2.2

Merge branch 'w03_MDL-31165_m22_innodbconv' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 8b23f31909e963f58eaa164c884f8938139fe50e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 16 Jan 2012 08:43:20 +0800
Tag:    v2.2.2

Merge branch 'MDL-31157_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit cb5d7dbe14f0da1c337102dc950126f989040310
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 12 Jan 2012 18:25:01 +0800
Tag:    v2.2.2

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit e516577ec7b90457fa5224baa82566f42c30f6e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 11 Jan 2012 06:35:15 +0800
Tag:    v2.2.2

Merge branch 'MDL-31101_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit efabe26141a510a3aee54981fae25fbc4928dcb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 10 Jan 2012 05:19:11 +0800
Tag:    v2.2.2

Merge branch 'wip-mdl-30608-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit f36884dde739f38b7c2e59f14cd57f8fc4e24358
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 09:14:31 +0800
Tag:    v2.2.2

Merge branch 'MDL-30031-22' of git://github.com/bostelm/moodle into MOODLE_22_STABLE

commit f35cacdc8366bd799af1dcb85b87bd906ee0067a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 07:33:31 +0800
Tag:    v2.2.2

Merge branch 'MDL-30966-print-object_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 7e20d8e330b340e3a7f8a7adc517aa22c8fc5397
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 07:18:18 +0800
Tag:    v2.2.2

Merge branch 'MDL-30635_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE