Git merges in Moodle 2.2.6 by Eloy Lafuente (stronk7)

commit 30b9d52d78f55dd37e3e3d535b459deed2e30da7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 10 Nov 2012 02:01:04 +0800
Tag:    v2.2.6

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

commit f5916ab5af5987f9851ad6425fff21c7f8e74ceb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:07:52 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit f06b2de39ed21d5c1b14945ed3e981717661cf9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 12 Oct 2012 08:18:31 +0800
Tag:    v2.2.6

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

commit aff7cb703a015b0dd7195d22efc442214d51afcd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 07:38:32 +0800
Tag:    v2.2.6

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

commit 827dd36f48daa4d10818622f2cdd4df9c674e45d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 06:40:26 +0800
Tag:    v2.2.6

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

commit 1bffd70569976f45424b42fadf7931a130992596
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Oct 2012 05:57:31 +0800
Tag:    v2.2.6

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

commit 7f13fc063c6156250ff76ef42772cf65788b9d99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 05 Oct 2012 19:33:20 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 1950fefc9987211deb9eb62c9f6083efa1546a45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:37:26 +0800
Tag:    v2.2.6

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

commit ab6a0f497b7f73e7cbddb93ad31c919539ffb8d3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 19:19:35 +0800
Tag:    v2.2.6

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

commit de165bab23e1cf9187696bec8cda9a3b82e0a4f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 01 Oct 2012 18:46:41 +0800
Tag:    v2.2.6

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

commit c43fe7f71e58399cf00f16607f46b2ffee050572
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 19 Sep 2012 06:39:26 +0800
Tag:    v2.2.6

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

commit a6e1cc12c82ded32fd12cb14eaf1d82fe2fd622a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:54:00 +0800
Tag:    v2.2.6

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

commit 3b4f791ba0f07f822983989194e57df66ec4225c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:30:45 +0800
Tag:    v2.2.6

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

commit 53b1a1ecb21ae7a94990f0243cfceefdd6d2c871
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Sep 2012 07:16:15 +0800
Tag:    v2.2.6

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

commit 62a22d5b9a77c65a103e449e261e9295a26905bb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 15 Sep 2012 01:03:37 +0800
Tag:    v2.2.6

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 63c4c85effabc3f0200493f5891c2a01ed64e93c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 22:30:58 +0800
Tag:    v2.2.6

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

commit 2b9782fdd012ff2e2b70c9a421eff653835884fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:45:08 +0800
Tag:    v2.2.6

Merge branch 'MDL-35171_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 0f43c243859fc8a465d859fe66be39f1cd77d820
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:23:16 +0800
Tag:    v2.2.6

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

commit 686723f4fa53c37b4c49b66e2a38eb1ff5bec080
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 08:03:24 +0800
Tag:    v2.2.6

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

commit 5f48905520d597b3dd9dd3c681aed9d235ff364f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:57:53 +0800
Tag:    v2.2.6

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

commit 86e2c5912851910e6fe0e58ccae72bec91cae35e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 07:53:48 +0800
Tag:    v2.2.6

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

commit 4eca916b5ffa5260a5d1475ea8b0de8e9ed8a9fb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Sep 2012 01:53:54 +0800
Tag:    v2.2.6

Merge branch 'w37_MDL-35289_m22_tinymcelangs' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 694c861e812523504d3c5d46ed7ddc2cf5522905
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 10 Sep 2012 22:42:09 +0800
Tag:    v2.2.6

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