Git merges in Moodle 2.1.4 by Sam Hemelryk

commit aa6d8f0f75ee9a9e9b9ef479b0d20bbc6160d2d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Jan 2012 06:16:58 +0800
Tag:    v2.1.4

Merge branch 'MDL-31017_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit b1a17fadcfb79148b4c5ac71d76ece104003a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:25:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-30802_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 1ed9377e7841b96dc957cd615415e07370f3950f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:22:50 +0800
Tag:    v2.1.4

Merge branch 'MDL-30766_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 9b82d1b4d4116bc6524379fccb97fb6b7d894854
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:14:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30168_tim2_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 19bfd159974921fab5a9f4021146a02395073c4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 06:11:53 +0800
Tag:    v2.1.4

Merge branch 'MDL-27200_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 39f8f2e181cacd24e411a7994a4aeed30fcae1dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jan 2012 04:57:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-13572_validate_email_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 98b05c1ca7df7cae4070a8875e904772bfc0cdd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:45:06 +0800
Tag:    v2.1.4

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

commit 4703fb429edd036895bee3679c2c7a5ea71bb2da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Dec 2011 06:20:56 +0800
Tag:    v2.1.4

Merge branch 'MDL-30639_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 50a1735fe4b1e8aa21e13a394a32b47550d4687d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 10:00:57 +0800
Tag:    v2.1.4

Merge branch 'MDL-29239_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit a2aa081e73994dc96aaa2149fb68490ba0d422c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Dec 2011 09:31:02 +0800
Tag:    v2.1.4

Merge branch 'MDL-30704_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 7d97d3ac7e9362fee00f6a6ebce42bd378417092
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 09:15:35 +0800
Tag:    v2.1.4

Merge branch 'MDL-30764-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

commit 0e9c5fbc89f5eddf5631fa35c1eca353d18731eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:34:37 +0800
Tag:    v2.1.4

Merge branch 'MDL-30760_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 57648d8d765e4da001e55032016a6a952d256e7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:20:57 +0800
Tag:    v2.1.4

Merge branch 'MDL-30646_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 85d7ec9052de8f42c2976c66ced7a132869a97fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 08:16:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-29846_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 490f178f04781e6eabd6a4e3cd4162153fd1c507
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:42:30 +0800
Tag:    v2.1.4

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

commit 16e8ccaf5f40734c17107027bf2b4797cecacc11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Dec 2011 05:05:18 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30697_m21_roleslink' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 3969853b1c10a4020306772c6be57363f1b387c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 10:05:20 +0800
Tag:    v2.1.4

Merge branch 'MDL-37049_21' of git://github.com/jamiepratt/moodle into MOODLE_21_STABLE

commit 0bc0394c8ffaaadfc4c46e974bd85529e1ae53d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 09:14:14 +0800
Tag:    v2.1.4

Merge branch 'MDL-30683_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit f158171c0bc6a49f8ea82bf43b9c7de649cfd506
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 07:23:05 +0800
Tag:    v2.1.4

Merge branch 'MDL-29176_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit dd98ec697cbf2dea8ce43927a3e87b2258d8d76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:52:17 +0800
Tag:    v2.1.4

Merge branch 'MDL-30734_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0006e0cfa13c883420b0dda429294292c4696f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 06:30:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30742_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit d854866de39dc3e3e088bbb71191e7b0a7314707
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Dec 2011 04:28:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30758_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit c5a4b44be6069535c7873d90bc293cc35c2c479e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 12:17:44 +0800
Tag:    v2.1.4

Merge branch 'MDL-27183_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 0bb848f74ce46bd0dbc3edba696bcbe29546ca37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 10:29:40 +0800
Tag:    v2.1.4

Merge branch 'MDL-30585_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit e6f195d0b44eaa77997678c5e70f24c6f9d76646
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:25:01 +0800
Tag:    v2.1.4

Merge branch 'MDL-30463_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 3d2ac8024d3311619caf6ea39c94b48abf93ee45
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Dec 2011 09:08:07 +0800
Tag:    v2.1.4

Merge branch 'MDL-30140-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit d380faef5cd9f421dd15d90e9c40b925261f1f52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:19:51 +0800
Tag:    v2.1.4

Merge branch 'MDL-30677_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit e66237cdcf8e2fbd0da49ee42040828759e72f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:14:54 +0800
Tag:    v2.1.4

Merge branch 'MDL-30532_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit c50442d0d7e93fbad9e96ae68a3675bcc82d091e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 06:11:07 +0800
Tag:    v2.1.4

Merge branch 'MDL-30498a_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 8d70e5cc74e463311fa91c4615929d2e55d69e54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Dec 2011 05:26:11 +0800
Tag:    v2.1.4

Merge branch 'MDL-27143_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 860551428c35d226e3752efbe139e7b47b4c9760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 12:15:16 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30588_m21_switchrole' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit dfda3efcc88c854e4c57973c2006d6117e7fb912
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 11:37:36 +0800
Tag:    v2.1.4

Merge branch 'w51_MDL-30659_m21_yuidebug' of git://github.com/skodak/moodle into MOODLE_21_STABLE

commit 16a6377ca8f9ea9c6bbbb9e279157178d24fc072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 10:13:21 +0800
Tag:    v2.1.4

Merge branch 'MDL-29942-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 1ac4f0edbcf1cea05f22d4a85cc84e350f96f86f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 09:56:52 +0800
Tag:    v2.1.4

Merge branch 'MDL-28180_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 494b8a8596fed2f1f3dc4f0fc31ff2df068fec02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Dec 2011 08:57:23 +0800
Tag:    v2.1.4

Merge branch 'MDL-30198-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 1921ff62f249febbdf75e0463ca617bfa6a25efc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 09 Dec 2011 06:43:41 +0800
Tag:    v2.1.4

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

commit 2fbbfb0187de0fcc9677f2e24f10c0384bcbd936
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 07:41:59 +0800
Tag:    v2.1.4

Merge branch 'MDL-29712-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 8305bb680fc3ac6fa7d6005eca22afeb4e3c97d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Dec 2011 05:47:43 +0800
Tag:    v2.1.4

Merge branch 'm21_MDL-30211' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit effe15308bed53e90be205fd551bddf41049ac91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 09:20:15 +0800
Tag:    v2.1.4

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

commit 40f4b5c562a83f3c4da410d7886d5a7a31363211
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Dec 2011 07:38:51 +0800
Tag:    v2.1.4

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

commit 280dc8bd45c57b17130769fcdb9e67a2269d70c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:48:56 +0800
Tag:    v2.1.4

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

commit be4ee6dcb1f5779b7c993c3237097e0313397fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 10:19:32 +0800
Tag:    v2.1.4

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

commit 71f5d75a463e4bbbbd4b4627737172df7ee3e4c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:29:38 +0800
Tag:    v2.1.4

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

commit fd2aab6c9df59c1ccba64176bdc7f3138635c08b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 07:16:02 +0800
Tag:    v2.1.4

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

commit 494b6c9e395bda6d3b07393c6c30c8bb525ff3ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Dec 2011 06:49:45 +0800
Tag:    v2.1.4

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

commit 7708c82e72a8f9c1a3cfbd809c0546a51be0e54e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:44:20 +0800
Tag:    v2.1.4

Merge commit 'FETCH_HEAd' into MOODLE_21_STABLE

commit 2fff9611fa4cae6fb0f203c1e04de2c686acbac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Nov 2011 06:37:36 +0800
Tag:    v2.1.4

Merge branch 'MDL-30287_grader_ajax_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit d21cf5744d39285a265001c2dee088d25da4d009
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Nov 2011 11:40:16 +0800
Tag:    v2.1.4

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

commit c3689810d5e9742938a6bfd3af8a930a63d63bc7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Nov 2011 13:55:22 +0800
Tag:    v2.1.4

Merge branch 'w48_MDL-30448_m21_urlpar' of git://github.com/skodak/moodle into MOODLE_21_STABLE