Git merges in Moodle 2.2.4 by Sam Hemelryk

commit ce70f9d0f71360b4b55ec4e1fa7196798197f476
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:32 +0800
Tag:    v2.2.4

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

commit e0c7cb6ffa8b3a85484368c381e770c8536c5492
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:14:48 +0800
Tag:    v2.2.4

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

commit c0c6e7966e62fbefefce4504d23818fa92678adf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:40 +0800
Tag:    v2.2.4

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

commit dcce2171604e77299480c200cbe90fc3ff3ce09f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:42:30 +0800
Tag:    v2.2.4

Merge branch 'MDL-32851-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 56861454c1cf2be10bf5f146b3d78973c53e3cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:25:46 +0800
Tag:    v2.2.4

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

commit 06a3ab6c0b82b2fff17d3d7fca25761e10f6a300
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:23 +0800
Tag:    v2.2.4

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

commit b16832db0d70ce2a343de356e9dbfa79efaf89f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:48:16 +0800
Tag:    v2.2.4

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

commit 461499b836058b968db70e45ff713302dabb3d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:43 +0800
Tag:    v2.2.4

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

commit 803122e110a09bf482c65212b2176b0aaf663701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:57 +0800
Tag:    v2.2.4

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

commit 1d2b991046ced8bb85f6e6d0d29ba966797f3ccf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:26 +0800
Tag:    v2.2.4

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

commit b917d504a3a2ca7fb294d38f298fe80d02308aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:29:32 +0800
Tag:    v2.2.4

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

commit 217926aaa14fb672e8eb2c660637cca87dfbf402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:32 +0800
Tag:    v2.2.4

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

commit 29515af1d8c917e5f1e42c82ed94e41182a0989c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:23:04 +0800
Tag:    v2.2.4

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

commit 52b6c9bc01df1fad656cf352e336c3c3b9f3468e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:37 +0800
Tag:    v2.2.4

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

commit 50eb136630921c907498495ba65ae5d7145146be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:37:28 +0800
Tag:    v2.2.4

Merge branch 'MDL-33090_22-missing-xmldb-strings' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit 57dd3c69097ce4bbecdbc4b6ac31bc92400af2e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:43 +0800
Tag:    v2.2.4

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

commit 65d7459b6d50c542a3493ee566bd72f02645c20a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:36 +0800
Tag:    v2.2.4

Merge branch 'MDL-31520-MOODLE_22_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_22_STABLE

commit 6a27fc8b341d77ca488c34a834ec0cacd7d40623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:25:06 +0800
Tag:    v2.2.4

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

commit 9331c1ec8c47c75b72f3cf2d956de52a6d3ecaca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:39 +0800
Tag:    v2.2.4

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

commit 46d433f7011dcfbeae3c9fcbdd54adbcb83556f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:54 +0800
Tag:    v2.2.4

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

commit 928a51ad3d6b3877ca9b38975415e1089263bc60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:05 +0800
Tag:    v2.2.4

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

commit 042ae10e1d1ea797d160498e6dbbe566ab981a38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:17 +0800
Tag:    v2.2.4

Merge branch 'MDL-26277-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit 5a3f6eb468de6a4c27daecc10693bdf5e3fd77e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:09 +0800
Tag:    v2.2.4

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

commit e5d6cd54616007b5593f7833b001fd51fa94136c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:18 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit dcd5d0840bc288e09b60225bb5d7e57805518640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:58 +0800
Tag:    v2.2.4

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

commit d48f4d2f75eebe5ce235b5cdeaa2983ccd7a44c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:12 +0800
Tag:    v2.2.4

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

commit 3d1e457e3e69961942fcbb4bdc69e4be886415e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:48:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32203c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit 05ceae9bb2e12dbf52d210b299bbd9f38e3c3bd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:16 +0800
Tag:    v2.2.4

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

commit 3e11be405b25ebef9fab1413634a5f76dc21f902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:23 +0800
Tag:    v2.2.4

Merge branch 'MDL-32204-mnet-auth_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 843599ae8611fd3d512002a2aa38c4956834ff6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:37 +0800
Tag:    v2.2.4

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

commit f97184b9c9ad1ced09047a8344c451b18753309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:06 +0800
Tag:    v2.2.4

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