Git merges in Moodle x.x.x by AMOS bot

commit a2b62eebcb27c8d045aef0b7e90f299a9c7627b9
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 21 Nov 2014 00:05:49 +0800
Tag:    v2.6.7

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE

commit 4ddf05260f43d041fe72024410192d1c6dd8ee7d
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 09 Nov 2014 00:05:42 +0800
Tag:    v2.5.9

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit a0f183ae84e1f9cf2b9351b03bc53d395176f9e8
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 06 Sep 2014 00:05:49 +0800
Tag:    v2.5.8

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit e417377e897e31f7308b40e73e74b9ded0714a84
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 11 Jul 2014 08:44:37 +0800
Tag:    v2.4.11

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit cdc60776d795e7d173f5a2e0135c56c835cca58f
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 11 Jul 2014 08:44:28 +0800
Tag:    v2.5.7

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit eb4b4c7ba094668f43b2e8fc86900e873465d53a
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:42:09 +0800
Tag:    v2.6.4

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE

commit 807d45073abcb32bf95793c83447fd627652c122
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:41:59 +0800
Tag:    v2.7.1

Merge branch 'MOODLE_27_STABLE' into install_27_STABLE

commit 340df7eb345bd8a84fdf02973b61a96dac158512
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:41:51 +0800
Tag:    v2.8.0-beta

Merge branch 'master' into install_master

commit 9bf48960a30315de7038d7da6a8a79f485418b2e
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 09 May 2014 08:41:12 +0800
Tag:    v2.4.10

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 035b6840d98e63ea058e20db2451958085caff3c
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 23 Apr 2014 08:38:14 +0800
Tag:    v2.5.6

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit 9ae6b73cafbf8d27221e1634fc2d8bd98531801f
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 23 Apr 2014 08:38:06 +0800
Tag:    v2.6.3

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE

commit fded9b6ea5f09f87931ba8f2e976da12d401c47d
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 23 Apr 2014 08:37:55 +0800
Tag:    v2.7.0-rc1

Merge branch 'master' into install_master

commit fbc50fb6996c31c813003428e6bd0909ca3aa075
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 07 Mar 2014 08:54:52 +0800
Tag:    v2.4.9

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 7800935d19b67dc307b38adac30605cc09f2fda3
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 28 Sep 2013 08:40:24 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit 38753adc60c91cd13229d761cbdf13002370d770
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 14 Sep 2013 08:41:38 +0800
Tag:    v2.4.7

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit caf0834e405f660d8d8eb79a258507517e4ba26d
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 14 Sep 2013 08:41:35 +0800
Tag:    v2.5.3

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit a2c52dabefab5e57dbc84598ec46ddc0ea7b7c13
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 14 Sep 2013 08:41:33 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit 77cb09867c0c4a8bd3c879cec6a5ff9f02e97cb3
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Sep 2013 08:43:15 +0800
Tag:    v2.3.10

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

commit 700e92b8d4ba4f2f18a07b00a574eb979b9933f8
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Sep 2013 08:43:12 +0800
Tag:    v2.4.7

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 22c1afc8f9e13d88bd1889d69c188156a12080df
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:52 +0800
Tag:    v2.3.10

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

commit efcbed9b73305bf166c0596a606d9e211ee22a20
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:50 +0800
Tag:    v2.4.7

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit ce31fccf0e8425fa7254b4a3b440c9856bced749
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:47 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit 88d4c218e9af99a37853fd51dedb2d8bc4f47878
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:45 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit 85ed2ec89b815a5612cc3e0e9037b61e52e8a27b
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:57 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 2fc1329f4486b3465f086ff8a4d1f9a724a25471
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:54 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit 096640fc5e3352483de2e6256945c2b845dec9e7
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:52 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit a8416f35c5d01bf66118289140bb88422833cc6e
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:59:07 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 441678ecb469b9460107069c483c294d7e2e485c
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:59:02 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit a28bdb19385f847b3322122d7bde20f642dbee97
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:58:58 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit b47ef00098136052c7dc7f075b0260a3d0e8c251
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:15 +0800
Tag:    v2.3.9

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

commit 0c3fe2f5f0bb178287629fe795a49362c041847c
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:13 +0800
Tag:    v2.4.6

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

commit 0147686fc7e2ca9abf4279232334cafd98fa7f35
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:10 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

commit 7081e477f243c2d8e1958d78123d9a755d88957b
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:08 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master

commit a1327196eedd7223fe60eec6bbfbe74a15be6ad8
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 14 May 2013 08:37:41 +0800
Tag:    v2.5.0

Merge branch 'master' into install_master

commit 1efcb6eb24728c06253aaa0c6f6f87e148bf41f6
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 26 Jan 2013 08:50:51 +0800
Tag:    v2.2.8

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

commit 8434e7de85f6c4c01a4f61edf94a0d960b96faa2
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 20 Oct 2012 08:34:51 +0800
Tag:    v2.3.3

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

commit caea6920a14b265d259b5f7939a71cf897ab06cf
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 16 Oct 2012 08:34:54 +0800
Tag:    v2.4.0-beta

Merge branch 'master' into install_master

commit 9865cbfb6073f2b55331c8a8093d8e67bd920d99
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:49 +0800
Tag:    v2.1.8

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE

commit eca810808c72f9ac62bd919168b4c047eba0c0fa
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:46 +0800
Tag:    v2.2.5

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

commit f84f35dda1001ca379c9a99c8429ef2848d016c3
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:44 +0800
Tag:    v2.3.2

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

commit 259211556ee770d95d67565ed8ede0b16ffffeee
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:41 +0800
Tag:    v2.4.0-beta

Merge branch 'master' into install_master

commit 335ded3169e0a70c66f7c6477851f65d54106187
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 26 Jun 2012 08:31:48 +0800
Tag:    v2.0.10

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE

commit b53489190daab71c05e2135a7191a1811144c89a
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 26 Jun 2012 08:31:34 +0800
Tag:    v2.1.7

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE

commit adb1616724704b1a4af0189b4b4b93640adebd19
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 26 Jun 2012 08:31:30 +0800
Tag:    v2.2.4

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

commit 7ec66c7da8445006608db62caab8845d464f76b4
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Mar 2012 08:32:16 +0800
Tag:    v2.2.3

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

commit 856623590c3ba8f3c1d5dfc9dc6c9f2d500eb0d7
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Jan 2012 08:31:26 +0800
Tag:    v2.1.5

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE

commit c56a8d44414257f1a4f017584b4c4288ef5aacab
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Jan 2012 08:31:21 +0800
Tag:    v2.2.2

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

commit 0d52d3366c8e0393d721b7f2d8f1bba4f6727591
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 19 Nov 2011 08:31:10 +0800
Tag:    v2.0.6

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE

commit 81b24b17cf054b9a3794c7f377ea0ce1cb02b763
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 19 Nov 2011 08:31:04 +0800
Tag:    v2.1.3

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE

commit 967bc47c80346cf6280f2a1385fc50df926cde36
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 19 Nov 2011 08:30:59 +0800
Tag:    v2.2.0-rc1

Merge branch 'master' into install_master

commit 953560c9c4b2b349e9458787fa6bbd6c93cfa9ff
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:37 +0800
Tag:    v2.0.5

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE

commit 9d7b02bec08b0eaf19b9b3271be028c45471dcd9
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:32 +0800
Tag:    v2.1.2

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE

commit 15218d81838acf90f3e15e886f4e0c81b8abaf23
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:27 +0800
Tag:    v2.2.0-beta

Merge branch 'master' into install_master