Developer credits

Git merges in Moodle 2.5.x by Sam Hemelryk

commit 33fdd3fd874edecf6b417dda6c57ff3e9a6129a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:01 +0800
Tag:    v2.5.7

Merge branch 'wip-mdl-45698-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 52292d67b029c6614fde9f3cdcab445c7e94b0a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:33:47 +0800
Tag:    v2.5.7

Merge branch 'MDL-42526-25' of git://github.com/jamiepratt/moodle into MOODLE_25_STABLE

commit bf010218153fc289c5320d74f10fdcebe40a2183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:53 +0800
Tag:    v2.5.7

Merge branch 'm25_MDL-45623' of git://github.com/totara/moodle into MOODLE_25_STABLE

commit 7babd6da4502967632ddb480b168695b7940c367
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:26 +0800
Tag:    v2.5.7

Merge branch 'MDL-44027-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit c6e2fa901f3795814248c56501e9c9a9cfe5286f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:29 +0800
Tag:    v2.5.7

Merge branch 'MDL-45603-25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit b3e480d34ec55e42e404f40841955ae337cd85f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:41 +0800
Tag:    v2.5.7

Merge branch 'MDL-45535-m25' of https://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit e44fbe93073ed3df031496a5b6b979af923e34d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:14 +0800
Tag:    v2.5.7

Merge branch 'MDL-37838-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 5c462d30cda36b1cd23ba4cf1ef9b30b5352c9fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:04 +0800
Tag:    v2.5.7

Merge branch 'MDL-45380-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit d6909258f1d73fa9a338d43b3a575c660e47eab7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:19 +0800
Tag:    v2.5.7

Merge branch 'MDL-45135-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 74dcc9c1bab07bf696963f4f717038e3ea7e0dbb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:15 +0800
Tag:    v2.5.7

Merge branch 'MDL-45561-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

commit 8f2747e5ca07af68deb467404bc527d406abe5f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:09 +0800
Tag:    v2.5.6

Merge branch 'MDL-45221-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 98778ee04f8ea303eca315e5a37e5632c9181e9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:48 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45280-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit ebda3b8926e3838a5bc4fe0da74d93582d0f1f0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:15:41 +0800
Tag:    v2.5.6

Merge branch 'MDL-45286_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit 66d76d519649fc21fc0acf4b978ba89f037e9ca5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:18 +0800
Tag:    v2.5.6

Merge branch 'MDL-45124-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit bedf257b404a164fbb52ad32732fbe473a30292b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:37 +0800
Tag:    v2.5.6

Merge branch 'MDL-45186-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 8ca374466283da39e109e98665f8dbbbec074678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:47:06 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45045_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 697496bcac176b4323eef5a2a88945e19b8a3831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:17 +0800
Tag:    v2.5.6

Merge branch 'MDL-43145-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 6c4fa4d535a58eb5ceaa0013e06743f015def072
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:12:18 +0800
Tag:    v2.5.6

Merge branch 'mdl45012-moodle25' of git://github.com/tlock/moodle into MOODLE_25_STABLE

commit 0a11ddf4c7af2785edb70f2397410ff584160124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:59:05 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45037-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit c3b94d995467b41fde12888c6e3899afba69f2c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:24 +0800
Tag:    v2.5.6

Merge branch 'MDL-44270_25' of git://github.com/jonof/moodle into MOODLE_25_STABLE

commit fd266e48bc777a06723a41f2ca6648d8f4175ae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 04:57:29 +0800
Tag:    v2.5.6

Merge branch 'MDL-42761-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 0f2e18f9c8be218ecee8745dda164c36fff4cd8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:54 +0800
Tag:    v2.5.6

Merge branch 'w16_MDL-45100_m25_coursecontext' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 31371051659e5dc8b07753742e50757ee05ae2a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Apr 2014 12:47:47 +0800
Tag:    v2.5.6

Merge branch 'MDL-40674_M25' of https://github.com/nadavkav/moodle into MOODLE_25_STABLE

commit 7ce77b73e2603be21acd3d483092da380db13c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:30:58 +0800
Tag:    v2.5.6

Merge branch 'MDL-38183_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 6aefe4ec3c26cf68b6e49827abd22ba5962ffa88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:49 +0800
Tag:    v2.5.6

Merge branch 'w14_MDL-44824_m25_subplugins' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit db1e66c1e067619e9c1cf05a85d67c89c232d88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:05 +0800
Tag:    v2.5.6

Merge branch 'MDL-43284-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 5e0e6a8c44a86891d562e2d76cc21ebd6b1c2d03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:30:43 +0800
Tag:    v2.5.6

Merge branch 'MDL-43960-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit ee986da3ed17d714ed75dd176125c7df60f85fe0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:05:01 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-44542-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 29591a867f7977fbc40a567d7027d1d7a8f9376b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:41:02 +0800
Tag:    v2.5.6

Merge branch 'MDL-44502-25' of https://github.com/bostelm/moodle into MOODLE_25_STABLE

commit 5cf880d88392deeddaecac4bba9b1a21fe78a6c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:35:59 +0800
Tag:    v2.5.6

Merge branch 'MDL-44433-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 069b3ae29c01c6d4c8a9a50dfb1ca09d312bb183
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:27:02 +0800
Tag:    v2.5.6

Merge branch 'mdl44499-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit faa87eb28c4d84eb68d4405d71959d2624ad9049
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:28 +0800
Tag:    v2.5.6

Merge branch 'w12_MDL-44516_m25_purifier' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7ad84b0c462d1236ff4fce293f79a4b13f80a58c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:26 +0800
Tag:    v2.5.6

Merge branch 'MDL-44585-moodle25' of https://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 1dc93170ae3972cd712cc10cd148ed3f9e0d6118
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:12 +0800
Tag:    v2.5.6

Merge branch 'm25_MDL-37733' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit f3e25119ad172c0d5d8e3cfa316bc5b614cd22c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:56:55 +0800
Tag:    v2.5.6

Merge branch 'MDL-42368-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit c6f0baa3873313bdfbd4bd8b0a4aec2f20c5ee83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:54 +0800
Tag:    v2.5.6

Merge branch 'MDL-44345-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit eb5d6cc5745b35e4d5588bbbe6cad7e05c6c21af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:37 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-40721-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit d59a7f97dd009d35049abd7ceee58da68c7bfc05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:11 +0800
Tag:    v2.5.6

Merge branch 'w11_MDL-44451_m25_addonloc' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit e75faa20f64df69723410e0b15c1f8cb0247b513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:54:32 +0800
Tag:    v2.5.6

Merge branch 'MDL-43721-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 9ef6537e4cc52d9fdccc716c12f4516caf54641e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:36 +0800
Tag:    v2.5.5

Merge branch 'MDL-44037_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 0c51cfefb7e001b3e4d8b62c9534cafcb29c156a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:39 +0800
Tag:    v2.5.5

Merge branch 'MDL-42404_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 077aa1b431cdf7478bd52165d3ee35eba94be811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:36 +0800
Tag:    v2.5.5

Merge branch 'MDL-44142-25' of git://github.com/mrverrall/moodle into MOODLE_25_STABLE

commit a2b2fa9b3fc8bf9aa84733e9e452a3a4d8b8e054
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:48:52 +0800
Tag:    v2.5.5

Merge branch 'MDL-44079-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 96dabdf68dc8b7c671203c57d245e59ce6232197
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:47 +0800
Tag:    v2.5.5

Merge branch 'int25_MDL-43200' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit be1ae343eaaeba8cb6d52a49f590d6b01e6ec5f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:08 +0800
Tag:    v2.5.5

Merge branch 'MDL-41644_25' of git://github.com/apsdehal/moodle into MOODLE_25_STABLE

commit e91a87511bb0b021cede298a64c7f7241f9ad192
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:55 +0800
Tag:    v2.5.5

Merge branch 'MDL-43941-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 04324e81e2734419e5f9f585c8565df14b9f5b02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:40 +0800
Tag:    v2.5.5

Merge branch 'MDL-43929_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit f7dea8ae75df256aa5ff501086ca9cf1b1c39057
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:18 +0800
Tag:    v2.5.5

Merge branch 'wip_25_mdl-32724' of https://github.com/iarenaza/moodle into MOODLE_25_STABLE

commit 36803e0f78a4f750a722c8e0b63034f4d5bc048c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:20 +0800
Tag:    v2.5.5

Merge branch 'MDL-43774_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit d42f989c8150592268dbd032729aea2b13677abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-40938-25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit d97c8c30ea306ff86ea3c728a4925f58b426a0aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:13:00 +0800
Tag:    v2.5.5

Merge branch 'MDL-42882-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 074b8b2989576de199ff2feced0ce4b89b6530a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:16 +0800
Tag:    v2.5.5

Merge branch 'MDL-44056_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 3c1bba2b114d020600330868808b10063d00f614
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:07 +0800
Tag:    v2.5.5

Merge branch 'MDL-43838_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit a29f1f962990b9b3e8f6525989dd4d4f5fbdfa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-43992-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 579319888cbff51abbc62a9538dc099c298a89c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:01 +0800
Tag:    v2.5.5

Merge branch 'MDL-44020-STABLE-25' of git://github.com/jleyva/moodle into MOODLE_25_STABLE

commit 1ffb89f9b8b81da7f5b61a0ba1e3aad373b7ca44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:14 +0800
Tag:    v2.5.5

Merge branch 'MDL-44046_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 5afb7fd120445877d658a2c4b864a6efcf3d5397
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:23:56 +0800
Tag:    v2.5.5

Merge branch 'MDL-43978_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 966bb0f45a94724fa38a1882b2a07526d291a868
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:35 +0800
Tag:    v2.5.5

Merge branch 'MDL-43994-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 202e947ffc2fc2db1ae8dd7e4e9b30750a6542cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:50 +0800
Tag:    v2.5.5

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_25_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_25_STABLE

commit 1397e103ba4d04b10628eb6e2b54745ff9bff9a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:42:59 +0800
Tag:    v2.5.5

Merge branch 'MDL-43946_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit ab34537ca49cf25fb790c79bb4a85e0501e5ce75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:23:57 +0800
Tag:    v2.5.5

Merge branch 'MDL-43369-25' of git://github.com/jamiepratt/moodle into MOODLE_25_STABLE

commit 06ce535d9c1dd6df888a128393ae8e08da6fc70e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:25 +0800
Tag:    v2.5.5

Merge branch 'MDL-43885-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 8aaf8591f1e834f50ac9229bddbac1bb351ea398
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:32 +0800
Tag:    v2.5.5

Merge branch 'MDL-43892_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 23ca363633cd37471011ae246d4e45479f26323e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:04 +0800
Tag:    v2.5.5

Merge branch 'wip-MDL-33920-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 881b8443ce42c59e364d7e53fa2ad747eda8d665
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:36 +0800
Tag:    v2.5.5

Merge branch 'MDL-43884-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 5461c61f02250da49973b91e8103c674ab2ee5c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:09 +0800
Tag:    v2.5.5

Merge branch 'wip-MDL-39942-MOODLE_25_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_25_STABLE

commit 9b14c62e98c556362665283c6ff971e4996b4389
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:23 +0800
Tag:    v2.5.5

Merge branch 'MDL-43246_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 6536f04a5e5fdf28c0897d7ef74c74f68b592c4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:20 +0800
Tag:    v2.5.5

Merge branch 'w04_MDL-43746_m25_courselogin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit ba5255f4f17fcc759070add6aaa1bcc94e6399a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:10 +0800
Tag:    v2.5.4

Merge branch 'MDL-35973_redirect_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 8a89a476e7a08d6bc3d4cb512aa9928951e0945f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:21:42 +0800
Tag:    v2.5.4

Merge branch 'MDL-43281-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit bf78d33216903b56cea52f78c4f2f7319249f5c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:17:58 +0800
Tag:    v2.5.4

Merge branch 'MDL-37962_beep_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 4c852874d197ac273d6c539cad656d2491793281
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:13:55 +0800
Tag:    v2.5.4

Merge branch 'MDL-43530-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 871b85e8cf2aed64837fbb1c3f529eec3eec872c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:02 +0800
Tag:    v2.5.4

Merge branch 'MDL-42212-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 9caa330e56d68e15d884a3416197844e743f00ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:40 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 986e4f6720f85287b53c7a2767358498e51883a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:51:50 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-41788_M25_3' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 5d10a4c6908b71709a865e62ea98c4db28e23a6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:23 +0800
Tag:    v2.5.4

Merge branch 'MDL-41246-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 1d5e5cc670f48733a2c1243d6c6fc206aa218f82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:22:53 +0800
Tag:    v2.5.4

Merge branch 'MDL-43438-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 77104a2bd2678b10139aa6f9e28677d2ac33cb84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:51:00 +0800
Tag:    v2.5.4

Merge branch 'MDL-43250-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit c7f13ceafc1efa808b89f7365f639990813cc0a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:36 +0800
Tag:    v2.5.4

Merge branch 'MDL-35032-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 7eba9ea8992e51947db267191cfda1a6c1616b65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:16 +0800
Tag:    v2.5.4

Merge branch 'MDL-30195-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 3aba4d0f12be138842f343083c777bb96bfb001e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:29 +0800
Tag:    v2.5.4

Merge branch 'w52_MDL-43367_m25_contextpath' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d071a951e14251fd1e6fb5c25e4bfe48bb277291
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:15:57 +0800
Tag:    v2.5.4

Merge branch 'MDL-34182-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 3dc592815af9ee069eaa5a5b444be3c8467b7853
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 12:01:04 +0800
Tag:    v2.5.4

Merge branch 'MDL-40750-25-fixup' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 9f90cd755345942c35514a8b5ce9645a97dee8bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 04:22:41 +0800
Tag:    v2.5.4

Merge branch 'MDL-43235_25-extrafix' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit f6c3162520a51cc802f879780f9507f1eb2f6bf0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:19 +0800
Tag:    v2.5.4

Merge branch 'MDL-43235_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 2f73b98955ec85f6b45c9a4dcdc24dd6add6ff50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:13 +0800
Tag:    v2.5.4

Merge branch 'MDL-43355_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 8a0ba53b9c21edc3429389035694b15bde43913e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:21 +0800
Tag:    v2.5.4

Merge branch 'MDL-38698-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 32196e43ca16304037fba3f500af401a062fa260
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:18:32 +0800
Tag:    v2.5.4

Merge branch 'MDL-40750-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 2a3ce2b33dc1914d3876c3002dc7529e5779e454
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:53:57 +0800
Tag:    v2.5.4

Merge branch 'MDL-25473-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 474a218fc8e8e6616f78de20ecdb70f1196d5789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:37 +0800
Tag:    v2.5.4

Merge branch 'MDL-34321-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 8e4e9d8d6719d95b15f359ccd065a848719f5eb3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:42 +0800
Tag:    v2.5.4

Merge branch 'MDL-36984-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 0c41eeda3a8be83a4a8f5d6153a31c5f340ce626
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:23 +0800
Tag:    v2.5.4

Merge branch 'wip-mdl-21180-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 92d66ed0bebea5dc50fb69c82820baf8f13a527b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:32 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-43348_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 1ebfb4a6c606d4e6eb246a761fa99cc71bf31149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:51:53 +0800
Tag:    v2.5.4

Merge branch 'MDL-40096-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 960edf3828724e65835be4d22dbed8f4ec8ab63d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:02 +0800
Tag:    v2.5.4

Merge branch 'MDL-40436-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 7827adcf282e2f82cfbb9e793cba8cb83eb5657d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:33 +0800
Tag:    v2.5.4

Merge branch 'w51_MDL-42931_m25_env27' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 13ab45efe4e8bf9a0e8b0b299967cd59abe56128
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:18 +0800
Tag:    v2.5.4

Merge branch 'MDL-42085-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE

commit 90dec729a5dcafc4722e21acab7c0c140ab305db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:23 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit a458eacede7c13a353c3ab2651d726752ee979a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:14 +0800
Tag:    v2.5.4

Merge branch 'MDL-43252-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit 0dc8e800979f5d28f41488abb2ec708a1c494fdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:31 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-43279-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 69a40654d85e47f9cfb9bd67489aa3228a4cc56e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:17 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 0da3aac317a6c726c0b303a0f8f151fcaaa5ef34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:47:46 +0800
Tag:    v2.5.4

Merge branch 'MDL-43194-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit aa1549681af897c5bd95d8c5298f8ed13fa7bf15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:23 +0800
Tag:    v2.5.4

Merge branch 'MDL-43152-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit d12121f3856efc891e02cbc386b3f8246fbbc286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:28:56 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43019' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit c7cde40bb5da19d87a0e8524920b157b05c8ae06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:23 +0800
Tag:    v2.5.4

Merge branch 'MDL-41592_25' of https://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit d653c838b0d7547740c2f6a63ef2c7616d8dd603
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 05:11:51 +0800
Tag:    v2.5.4

Merge branch 'MDL-43093_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit f591b27e11ebcfce7a62fd52d4ac74f58c1deb03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:57:25 +0800
Tag:    v2.5.4

Merge branch 'w48_MDL-41819_m25_maxinputvars' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 4cedd8fb9da1f9d174dec90612552fcabe5c95ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:42:02 +0800
Tag:    v2.5.4

Merge branch 'MDL-43005-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 4f314c0d62dcad486727b78cf3e5a18dadd92130
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:27:55 +0800
Tag:    v2.5.4

Merge branch 'MDL-41316-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit b85181b3cd8ab13ef5557fcb9194a9eeb28305f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:28 +0800
Tag:    v2.5.4

Merge branch 'w47_MDL-42612_m25_paypalruble' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d9ca430e4fec15f4f6a55f8af4c441f2222ebeb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:06:08 +0800
Tag:    v2.5.4

Merge branch 'MDL-42774-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 37c71ce3cc54ce126e6778dc6e360e12eecac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:25 +0800
Tag:    v2.5.4

Merge branch 'MDL-42863_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit a073d7c8b0222f162da3d7177b1d91f036a65152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:32 +0800
Tag:    v2.5.4

Merge branch 'MDL-42865_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 31767636d8630d2be8335964b1b5cfeacd08755b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:43:42 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-42852_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit ca8790e981d8b6948dd063fea8b991dd648e0da3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:13:13 +0800
Tag:    v2.5.4

Merge branch 'MDL-42184-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE

commit 5b8ead0e73f021156cbe7bd8bb96d3a824f7ef15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:08:05 +0800
Tag:    v2.5.4

Merge branch 'MDL-42853-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 36c192677e8408660326a4e365595ee146f8664a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 14:09:54 +0800
Tag:    v2.5.4

Merge branch 'wip-mdl-42795-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 6d50856c1f560e07f3357068328425a7363adcd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:19 +0800
Tag:    v2.5.3

Merge branch 'MDL-42648_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 121de7fe9fee98788aa24a5d5a143deceba1e346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 15:08:49 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42379-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit 65c6eb8141ca7100464994136c22e1d466846ec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:19:41 +0800
Tag:    v2.5.3

Merge branch 'MDL-42284_behat_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 4d5be0764a93df33f8bf126319835dc7bc84e158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-42574-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 0460b39c135a09bd152b685b002f7396db9555e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:39:24 +0800
Tag:    v2.5.3

Merge branch 'MDL-42542-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 9c60ab15139225e574805caf7fdde10fbe46d9a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:39:32 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-41744-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 06db3cf3cc2578fd01af4a4e6bbec30095b783f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:04 +0800
Tag:    v2.5.3

Merge branch 'MDL-42188_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit 2ec16f735aeedefa992d9be4b8467bf5f6bac3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:39:42 +0800
Tag:    v2.5.3

Merge branch 'MDL-42072_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit c50daf9ae7e33f8322224cb0d34ee3341f9d321e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:42:47 +0800
Tag:    v2.5.3

Merge branch 'w41_MDL-41197_m25_convnotices' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 93bf71cd8eb162e1a795b2c8aa6567b8ffb98867
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:34:07 +0800
Tag:    v2.5.3

Merge branch 'MDL-41352-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit af911b089a4142d802515b1d2eaee72bec419362
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:45 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 8c90bbcde00dad229912133ce049f8d0f8234ed9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:13 +0800
Tag:    v2.5.3

Merge branch 'MDL-41995_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit ae9f3c0671e448b6485c7fb178fae95142683b3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-41900-m25' of git://github.com/micaherne/moodle into MOODLE_25_STABLE

commit 82ce52426eae0a2708d0a059dbdeeda3668211ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:44:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41894-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit b45f2c01c6739570bdffb55493533745e98ef815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:29 +0800
Tag:    v2.5.3

Merge branch 'MDL-41228_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit a45ff7d8a6031b13bfa019dbf7939aaa68cc485c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:01:16 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41676-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 3f4b04ec3e1efb1d1566c3ab37d2e3b30ec4d989
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:53:56 +0800
Tag:    v2.5.3

Merge branch 'MDL-37973_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit fea809a7b89ada98cc9a7f508e49f9eaf7ee2ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:45:44 +0800
Tag:    v2.5.3

Merge branch 'MDL-33569_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit b8cf62bf047a891acaeb4d4f7f1de73d8e4dc71f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:13 +0800
Tag:    v2.5.3

Merge branch 'MDL-41907_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 72ca4b0acf9d4344ae9650092d37d926031f170e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:17:52 +0800
Tag:    v2.5.3

Merge branch 'MDL-40848_m25' of git://github.com/totara/openbadges into MOODLE_25_STABLE

commit 9b70e23754707d7e5483f4858c486db1d43bcad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:32:57 +0800
Tag:    v2.5.3

Merge branch 'MDL-36465-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 158785810a80f2626ebdb4967bba24d06207a0d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:46 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit b27ca3514ed22894151f27347d308441834579c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:58:33 +0800
Tag:    v2.5.3

Merge branch 'MDL-41667_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 6d05276c0203cd1b5831fcecf5b58c25f6310b75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:02 +0800
Tag:    v2.5.3

Merge branch 'MDL-38317-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 82dc37c88c23d4bb0835dd4a3a509575a1d638ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:55:25 +0800
Tag:    v2.5.3

Merge branch 'MDL-38194-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit c998a75fdbcf9395418f31d5fd00afb5c0bc1f11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:50:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41637_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit f534464a060f5bf0cd5c46284edbe1fad503c671
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:47:47 +0800
Tag:    v2.5.3

Merge branch 'MDL-41662_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit f8eaa73b4195591d80ae42ff0a20c09663f6d766
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:38:34 +0800
Tag:    v2.5.3

Merge branch 'm25_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 10c3f9e7e8b155db30f46bbd7eee52b09c331a17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:01 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-27684-MOODLE_25_STABLE' of git://github.com/satrun77/moodle into MOODLE_25_STABLE

commit 8377c04acfcb41a7f34249468ddbf7eddbfa358d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:49:53 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-41605-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 884d1b2a41de3baae09c8c3c61cfb834b2afe508
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:25 +0800
Tag:    v2.5.3

Merge branch 'MDL-41658_M25' of git://github.com/kordan/moodle into MOODLE_25_STABLE

commit 7952a767a31e87f0caf50ad1454b2d6a1d461240
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:21 +0800
Tag:    v2.5.3

Merge branch 'MDL-41528_MOODLE_25_STABLE' of https://github.com/nitzo/moodle into MOODLE_25_STABLE

commit eb398c5ce60310c7085e5fc04238e65eade6f43d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:39 +0800
Tag:    v2.5.3

Merge branch 'MDL-41630-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 89c92427ad4c8d4939ccb45c046499ec96bee4c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:23 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41578-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit c26684b2bed47cc99d56f6e7d2dd47856826b7f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:38 +0800
Tag:    v2.5.3

Merge branch 'MDL-41587_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 492351897d501dff688a094d239eb9228e845f30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:50:50 +0800
Tag:    v2.5.3

Merge branch 'MDL-41555_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 3f6c2f7de8a69b02af61670b6b0d6cd450c8c973
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:11:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-41600_25' of git://github.com/aolley/moodle into MOODLE_25_STABLE

commit 7eb3ddf9b5cabb95c324ea5e996eefa858df02f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:35 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-32862-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit eb52eb1df073f030f3b92b488d726b6db3971ce7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:35:59 +0800
Tag:    v2.5.3

Merge branch 'MDL-29378-survey-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 119bc4adfc86a38d27006c86c350472c3927bc69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:23 +0800
Tag:    v2.5.3

Merge branch 'MDL-38794_25' of https://github.com/prateeksachan/moodle into MOODLE_25_STABLE

commit 9691b405fc738ae2757cf993ba55179a9e1812b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:51:07 +0800
Tag:    v2.5.3

Merge branch 'MDL-41417_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit efe6343ee0bdc124094b1c68817f16a59b1844d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:37 +0800
Tag:    v2.5.3

Merge branch 'MDL-29378-survey-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 5cdbdc4a7171d803592c6ad7ba66bc50cd2747ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 09:13:18 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-40830-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 34884b3ec8950f5476d38adf939bc4bfa881b5ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:13:06 +0800
Tag:    v2.5.2

Merge branch 'MDL-41162_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit aee98acb92a5d138a395e1e611c706f4478fee11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:59:54 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 8afa842c60380e05484da760bd2244cc21b8770b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:34:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-41157-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 6ef239f1c83af0835bc5e9a3495cde25bfb079ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:30:14 +0800
Tag:    v2.5.2

Merge branch 'MDL-41196-m25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 3f1c01de8d204296bce33bced061e99c3016d1ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:16 +0800
Tag:    v2.5.2

Merge branch 'MDL-41045-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit 7ccc8e8b1c52c7c3fb98312afeb09d5b123cf99a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:41:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-39691_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE

commit acea87e9b2999e8c82817ffafb7ecb410ebcc17f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:29 +0800
Tag:    v2.5.2

Merge branch 'MDL-41091_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 05c04ad471a764be3aea8c20b573ae7401d62432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:31:43 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-41114-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 6ae19630c5a0db8d1235323cea7c04cf8a8a8f03
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:22:44 +0800
Tag:    v2.5.2

Merge branch 'MDL-41033_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 19f92cfd80bd54bafb8d709645ff70030b2ea005
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:09:59 +0800
Tag:    v2.5.2

Merge branch 'MDL-40852_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 8e086c697ea044a36ab49aed96611d3c08c63f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:08:04 +0800
Tag:    v2.5.2

Merge branch 'MDL-40996_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 2f1dbeb9bac02a2fe4eb3e7d7b683c078ebe4613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:25 +0800
Tag:    v2.5.2

Merge branch 'MDL-30895-25' of https://github.com/mouneyrac/moodle into MOODLE_25_STABLE

commit 5c46191bd0b5da7b76b60041fa357517df4eca2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:38:20 +0800
Tag:    v2.5.2

Merge branch 'MDL-35931-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 55ad6e58419957aa3fdd85af172b0c6d8385ff2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:35:34 +0800
Tag:    v2.5.2

Merge branch 'MDL-35919-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 2f4aa72775b6561d3c507845f9de823fc098d49c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:32:43 +0800
Tag:    v2.5.2

Merge branch 'MDL-35934_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 7ff9696fcb536fb05f3dca3fd903c16fd24f7c74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:30 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 7478d2534b6546e04bbc1426b51c6a4ae42e311c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:37:34 +0800
Tag:    v2.5.2

Merge branch 'MDL-40086-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 3267d961326894453c1d2540c2e6b7873cf412f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:17 +0800
Tag:    v2.5.2

Merge branch 'MDL-34989-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit aca4d181b982b3fe1b6ab0a99fecbbb1aec02741
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:36:08 +0800
Tag:    v2.5.2

Merge branch 'wip-mdl-40469-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 0b1ee3b87177f384f13678aee8c99c7a0944285c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:01:55 +0800
Tag:    v2.5.2

Merge branch 'MDL-40420_25' of https://github.com/prateeksachan/moodle into MOODLE_25_STABLE

commit ce3fe87f9174e349cf897a537221e7b0297349fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 12:55:31 +0800
Tag:    v2.5.2

Merge branch 'w32_MDL-41002_m25_enroltypo' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit d3751ed482b6bc8b8572e1e252c69aea78106a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:29 +0800
Tag:    v2.5.2

Merge branch 'MDL-40662_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit a2f561b6a7401bd3d1748235a3465d80a58dbf1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:10:46 +0800
Tag:    v2.5.2

Merge branch 'MDL-27953_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit eeb784d41d7bee8c91d52f2bc99dec55b4698e25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 05:55:10 +0800
Tag:    v2.5.2

Merge branch 'w32_MDL-40889_m25_jsminify' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 85180a0fa925704f0bd1f5181ba973c08e8afb67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:46:44 +0800
Tag:    v2.5.2

Merge branch 'MDL-40937_assignment_history_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE

commit 737542c6741f00fd3a25803b56c139ec640d833a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:37:14 +0800
Tag:    v2.5.2

Merge branch 'MDL-38758_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit f16972e717682955fb7fdb1c0a9c8484efc5b5e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:32:12 +0800
Tag:    v2.5.2

Merge branch 'MDL-35922-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 9f15b383d16342517b17432f5a6a4cedb15b7df4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:38 +0800
Tag:    v2.5.2

Merge branch 'MDL-35927_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 03c3e7c4e841efee2e3cc878bbaa50137135c292
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 09:36:43 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-34785-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 1496e4990fee8be8b66f23f5cd9b1ffdf16c9e05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:26 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit cecc076eb75b832d6687feee0ce6f72fc989891d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:40:28 +0800
Tag:    v2.5.2

Merge branch 'MDL-40746_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE

commit a38830a07b9ce95043ab005872ff99e84d57e47d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:59:26 +0800
Tag:    v2.5.2

Merge branch 'MDL-39461_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 5fb1fad943d03ed9d99a96c8ff491203f70513cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:16 +0800
Tag:    v2.5.2

Merge branch 'MDL-40878_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 7b3a806741fb6dbb3250f422360ce47adaad6286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:52:35 +0800
Tag:    v2.5.2

Merge branch 'w31_MDL-40891_m25_mkdirrace' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 8ba4fd3b9a89b4c6c74cde1af74d76b2d7fc67fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:49:41 +0800
Tag:    v2.5.2

Merge branch 'MDL-40727-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit fa386d3e366119126aece3cba5e26fd570054fb8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:45 +0800
Tag:    v2.5.2

Merge branch 'MDL-40854_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 7de495d5c6f622f4445bd70d176d6015ba2c815b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:27:58 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-37869-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 5590ac2aff903f57ca8c02342707b4bbcca84382
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:14:01 +0800
Tag:    v2.5.2

Merge branch 'MDL-40315_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 63ddd040c0d1debf49ea3d58cf23a86fd256a936
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:13:59 +0800
Tag:    v2.5.2

Merge branch 'MDL-40680-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 70e9700195a01da1eb6414c142da6ef306d40207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 08:18:36 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-40593-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit c001e046e04e6cdddab5643060970d1da1297f9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:02:01 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40450_m25_tinymcebuttons' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7c6e64c36cbd72b51ffcbf4c162bd5667d5ba279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:31:25 +0800
Tag:    v2.5.2

Merge branch 'MDL-40527_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit c6b546a1ee58c1878b2eddaca84df1ea784a4a9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:09:59 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-40512' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit f0d974fb28d8ddeb77663eb2d25886930608a9ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:28 +0800
Tag:    v2.5.1

Merge branch 'MDL-39733_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit ebc9b6d15833c40d4fa3aded8c7e4686765d0fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:47:50 +0800
Tag:    v2.5.1

Merge branch 'MDL-40069_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit d20391916c7a464a47aa5d6bbff48d824b503b65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:17:48 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39741-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 9a561bc5a1430f11bb68ac6bae4888863c61b82a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:15 +0800
Tag:    v2.5.1

Merge branch 'MDL-35206-email-links_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit 6e07abb32dbe4d11a6267e622a2d16621cf5fb9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:58:44 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40065-m25_4' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit bc0227d3e5a1145225f5df45324e6b302befa21f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:05 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40289_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 4418496864cab6ddc3a9d73e21d0cab45c54cc91
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:41:24 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39044-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit 82125f7a78b29f50f58995a31050d3502f522cdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:07:14 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9e5adb930599c9b4a1f6dea27f8b2010863e4215
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:33:04 +0800
Tag:    v2.5.1

Merge branch 'MDL-39779_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 23dd6b7ebf53b3fce43f42905578ac93f7d96693
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:29:56 +0800
Tag:    v2.5.1

Merge branch 'MDL-39760-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 12a9b4ec3a7d7f36783bdeef79a82e314b47eb2b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:43:54 +0800
Tag:    v2.5.1

Merge branch 'mdl25-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle into MOODLE_25_STABLE

commit 405a60712b1364e9c419fc0f02fd3f77d36b1204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:08 +0800
Tag:    v2.5.1

Merge branch 'MDL-28124_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 70d4b3182d8f5f90e30715985c144cfec670fda9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:50:47 +0800
Tag:    v2.5.1

Merge branch 'MDL-39634_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 663c69e9740ddcdd1b6c9efda030588d95330cdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:59:30 +0800
Tag:    v2.5.1

Merge branch 'MDL-40036-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit eaf48543592cb4752454d33d740f90ee105093a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:56 +0800
Tag:    v2.5.1

Merge branch 'MDL-39865-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 3d19b183c66157e3f426bddd13feb4d891a4410c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:30 +0800
Tag:    v2.5.1

Merge branch 'wip-mdl-39863-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit d81ebc8f0dafb7a572978252ed102604217b8287
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:07:57 +0800
Tag:    v2.5.1

Merge branch 'MDL-40109_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 54c7d518f3f9fd0e0fb9b82608abf7ba09c4b88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:53 +0800
Tag:    v2.5.1

Merge branch 'MDL-30132_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit e15bf9b1e5ee05cb8e81f8ee54d60f067db34ba4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:10:38 +0800
Tag:    v2.5.1

Merge branch 'm25_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 1d1b52eb0cb559732ffc91e82ac3d09129d04710
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-21933_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 209658eab2c8e38a45d22a55c417a6350ef542a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:18 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40091-MOODLE_25_STABLE' of git://github.com/satrun77/moodle into MOODLE_25_STABLE

commit 8c155823cc61f80ff42c2da715838e3da46769b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:21 +0800
Tag:    v2.5.1

Merge branch 'MDL-39369_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 443563a82ee921bc497af87ff07cd8d31abc7f8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:26:37 +0800
Tag:    v2.5.1

Merge branch 'MDL-39761-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 69303857c75c373dbe1914f9019ba48e0d282998
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:06:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-39940-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit a4848b404463c028f4cc70b7b76431539be5465d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:02:40 +0800
Tag:    v2.5.1

Merge branch 'MDL-39964-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit a6b980d13b6d40f9292c896a1c0fbc567c310a3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:11 +0800
Tag:    v2.5.1

Merge branch 'MDL-25901-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 9e53bbd007ed6b7b0a2af8727a7c8c0835c5a54c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:53:49 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-38109_m25_pluginlist' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit e0699a7154b5235d631b148fb53a4ce8391e6378
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:21 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39798_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit aa41f96d1a501c82b698464a2b121bfda34495b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:46:45 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39820_M25_2' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 624f270a262fc411dc79e66824b8c2c651e6fdd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:36 +0800
Tag:    v2.5.1

Merge branch 'MDL-26925-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 313bcd5268c173f9ebfecb784c3bd683f38d2bbc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:24 +0800
Tag:    v2.5.1

Merge branch 'MDL-22390_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit afe247a0ca5ac05ec747cc5243924a663b5b3a55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:48:11 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-39549_m25_cohortsearch' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit f7c29429616221c11cac1d233974db9bbb528763
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:34 +0800
Tag:    v2.5.1

Merge branch 'MDL-39971_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit f981643f585929445d10d47f9e323af268a79993
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:44:40 +0800
Tag:    v2.5.1

Merge branch 'MDL-39978_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 2f8602990f81cde9fe88041a919b747ff40130fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:07 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-32480_m25_imscp' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 08c2a3ca1fd4108a889fc30a2ddc4f7e0bbe9642
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:04 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40088-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 00afef17bb68bce4b3f15d1b8fd7eb8dd32b7108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:33:59 +0800
Tag:    v2.5.1

Merge branch 'MDL-39979-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit f000edba16c901a70a0dff1c4490dc278362932f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 14 May 2013 05:15:54 +0800
Tag:    v2.5.0

Merge branch 'MDL-39573-master' of git://github.com/damyon/moodle

commit 55848bc3f6c7c1306fb798af451761c5348f82d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 May 2013 11:40:17 +0800
Tag:    v2.5.0

Merge branch 'MDL-39595_master' of git://github.com/lazydaisy/moodle

commit 8b5647b8d70660349ab9943e21b9c9ea4760ca70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:41:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39602-master' of git://github.com/damyon/moodle

commit 635d8bc84be14902b458fc33316a7c1108a4a477
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:23:26 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle

commit b3a9bf23f5ebb0e2ca943d2bdf3964ba15ef1e08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 May 2013 05:54:13 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39481_master' of git://github.com/dmonllao/moodle

commit e4e8d577cd8c1b728066ec877881780948ce556a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 May 2013 13:11:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle

commit d5cdfbc28884fdc3cfc2a620505f2e2078da1028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 07 May 2013 12:13:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39364_clean' of git://github.com/lazydaisy/moodle

commit d25103c4ef24a2f0a67fc815ea2419890a0467a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:15:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle

commit eb426f2480c84a5036825f374427d35471d2c147
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:05:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle

commit bcd4bf03431a22cc20d42e4d37ea4206a2793786
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:02:25 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39414-master' of git://github.com/danpoltawski/moodle

commit fdba83df89e7888736e3dbd736feae01e20e62f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:24:13 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle

commit 48fce3678dc273fdcc3b6254598c926b232c59f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:14:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-36060-master' of git://github.com/danpoltawski/moodle

commit d36cc73edb4b20841d9f5502b3c48d00b579b306
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 07:00:06 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle

commit 2a03b6dafe37070c645dd88b5c9c5854e1c9a83b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:38:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle

commit 0f540591df274ed8d5ea5a7b275b410407a2cf6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:08:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle

commit 3e9406bc17f5e23528eee3b61cee27dcb5a58d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:57:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle

commit e76a515f3198890ac5d31b2d903bddb86e976ece
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:48:18 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39377' of git://github.com/colchambers/moodle

commit a91f5ccb86b9c30248faaf8e5df14768b249c8c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:50 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle

commit 8e8a39aea03f55efe8778d2cd663f29845aef020
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39398-master' of git://github.com/FMCorz/moodle

commit e6cf0a866b98e4e698c7397327167d4e001fa8fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 11:00:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39387_m25_authdocs' of git://github.com/skodak/moodle

commit 0c5d8ccb9aab65e8c025da1f1fd6e93ff4a4b9e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 07:15:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle

commit 036b18a2979013008ec9df3c14aad87b0e16918c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 07:07:26 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle

commit 57453609156b7c158014804c315bca0ebb11dca7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:54:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39192_master' of https://github.com/markn86/moodle

commit 1517981b38d4743e400c8271e2ab06456ec7f672
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:45:33 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39298-master' of git://github.com/abgreeve/moodle

commit 73766925275cb2e13d20c84da8bcade520b8e3eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Apr 2013 06:17:03 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle

commit 6b39eee9fd737a5bcd5c699c67de1952cede806f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:34:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38893-master' of git://github.com/phalacee/moodle

commit 851ef997dfdad2ef6d21a8ee024b3c0f4812e471
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:25:46 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle

commit 92809986aa7dadab84e21018f2241489ed9c4764
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 11:24:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle

commit 54ed002fdcdc5ade8917e60d92a5a4bdf5eadc5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 09:41:45 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle

commit b88338f64764eb4a6d75bc09a98f20836fd9ad7a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 08:12:58 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle

commit 9c2cbcdc040ed1ad1a7765c9190e1ec36d59d62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:37:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39220' of git://github.com/colchambers/moodle

commit 6801246c50fd953d67b64c85d0301c50d61411d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:10:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle

commit c26f34baf11ad0e29dc61cdd86e4461a73557423
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:02:39 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39172' of git://github.com/jmvedrine/moodle

commit 9fdb1c1a638b881c5b31d7a95328f692330e4b42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 06:35:52 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle

commit 48d253c10071c15a16e2542be799810460c3b0f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 05:23:54 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle

commit 459699105c946e6c9d7ee121b23beebb6449c3e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 12:37:31 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle

commit a03fdbb0997cad11510ee91057a8a5c6dc698971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 12:23:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle

commit 476554bbca4c95ae59f8cb598d4cc92d799f4b87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 11:20:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle

commit 91d72d31059e1bde5ebbb34ad1a436dc50246573
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:54:41 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39164' of git://github.com/jmvedrine/moodle

commit 52b4bd37e7e23fe78cf1e3a6bc279eafaa18fe0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:41:25 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle

commit 5ab262321c3817e9858aabc400f4ecb4a379c00f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 10:02:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle

commit 4d35c88e10c9d3f478e2057e97a418d006ba08df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:55 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle

commit ff76b6044b6a9e1c62bda791ca1f5080e84acc4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:48:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle

commit 44cfa89576b0da9b52b873f7a5ef55f2a2cf42ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 11:57:50 +0800
Tag:    v2.5.0-beta

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

commit 2e2bac9d321b505a98b03e8d3718dd743093b744
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:30:45 +0800
Tag:    v2.5.0-beta

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

commit dc8e7116a75fbfa686c84ff95911b04370167390
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:15:24 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle

commit aa9f48ed5998af2ce043b352f87ae8794c4b0d30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:12:08 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38298' of git://github.com/stronk7/moodle

commit 5c1d5998acb3e5736a88a58a62b5e1977b08f731
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 08:54:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle

commit ed2703290cdcdd041a002406ab4218bbe14fdaf4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:30:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38101-master' of git://github.com/sammarshallou/moodle

commit 486f9dbecc39f17a259668d573b6748cff235589
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:25:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle

commit 572282230242f36acfdde5129b738186ed0e582f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:13:09 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35350' of git://github.com/rwijaya/moodle

commit 1668803ae21887e1ea6d0e7a531fba1035d6edf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:08:08 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35127-master' of git://github.com/damyon/moodle

commit 4ce761716c9e06ab2938df77a8b7cb1d59ac2026
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:35:59 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle

commit 74bf99ddad77b59a8e3bd88ddd7796d52814ca0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:49 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle

commit 7171c61c40fc6ef979de5d48bc824d8adb8df5c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:58 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36128-master' of https://github.com/StudiUM/moodle

commit 121e6048519d09f048d153acb8615d7787c66401
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:35:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle

commit f0abd36e46cf7b4f2a45ae4718285211569fdd8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:37:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32125-master' of git://github.com/StudiUM/moodle

commit 07ccb35731d40c1721e23df5df9ca77ea8dec5fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 10:43:26 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle

commit da810f581687c2a8cd71f30740b1dec297315daa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:24:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37476-master' of git://github.com/mouneyrac/moodle

commit ab58c6b724db692043f9538fa3a885ca4b0d0a88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 09:56:57 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37716_m25_enrolexpiry' of git://github.com/skodak/moodle

commit 3178ae6f09b7f30561ef45e9baa3d260c1e1abf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:50:14 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-36619' of git://github.com/rajeshtaneja/moodle

commit dabe6985e4e76d54e19aa4ca9c973f5efaf060b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:19:31 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37696' of git://github.com/danmarsden/moodle

commit 41f3d113f72e42f33b8a6ed88b55f6cd4056cfcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 05:17:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle

commit 49c204d1ee7e033df8a5c1623dce24ce7c9b9f9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:55:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37350-m' of git://github.com/andrewnicols/moodle

commit 5126bab95c940ab526aedc75d3f5286195c97768
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:52:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36881-m' of git://github.com/andrewnicols/moodle

commit bf6a1b90784a3242cd327011023438acd7c4b097
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:44:15 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37596_m25_schedmaint' of git://github.com/skodak/moodle

commit 8d8e6b151913d69ccd927d683f881fc0bfa960b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34671-m' of git://github.com/andrewnicols/moodle

commit 44aad1234792cbb835f7a67bc70f07fb83fb92f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37668-master' of git://github.com/sammarshallou/moodle

commit cb4adcc4a4b465913b6c9231b7394f2ff27340fa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:28:31 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle

commit 502e7853118814b68e5027cb8d90fc8cb1f6dc26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 13:00:07 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37638_m25_rolecloning' of git://github.com/skodak/moodle

commit 44a951b28d85e84777295ab7a5c15bd0f05a54c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:56:05 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37666_m25_cssiesend' of git://github.com/skodak/moodle

commit d0ac573b7fdcce05f0c8f391096c6a5e8db5ac3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37713_m25_testdir' of git://github.com/skodak/moodle

commit 3619009d0b2e94a54dcb0fa16b6ea1b1fa3d9842
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:50:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37677-obsolete-cache-debug' of git://github.com/mudrd8mz/moodle

commit 34e41c81f8ae18323692488f769987de88cdeffb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:49:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37673-muc-groupdata-typo' of git://github.com/mudrd8mz/moodle

commit 635bc28d98638128abf3e47259c61e101157c617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:46:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37548-m' of git://github.com/andrewnicols/moodle

commit be54d2015d564b4bb523f91e460f0d69a9bfe48e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:40:08 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37614_master' of git://github.com/lazydaisy/moodle

commit d38df267a0e83bc2f49f5d35704d264ed8b0640d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:40:01 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37611_master' of git://github.com/lazydaisy/moodle

commit 225a85806d7ad3a2c8956ced23b4725290d986bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:38:36 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37613_master' of git://github.com/lazydaisy/moodle

commit 56a81ad8568ec159ae3f98d233f959f02ee98729
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:37:07 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle

commit 58f828ca14142611643b355977e97e3d78deaf08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:35:04 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle

commit f9a71cb033ba29371620563e0291c0a6e4054fb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:29:24 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle

commit 682a1c0108afb4d28530341abaf02a1efc4f6105
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:25:51 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle

commit 81ee22017aa5278a396d922ff18400ba7a85069a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:42:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37628-master' of git://github.com/grabs/moodle

commit e003d7dc5fec17d72b639b634293faee19ce93c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:36:28 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37640_m25_zipclose' of git://github.com/skodak/moodle

commit 0449f2e6da7dc2fd4d5803652112523f5954f2bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:32:09 +0800
Tag:    v2.5.0-beta

Merge branch 'w04_MDL-37407_m25_chineseunzip' of git://github.com/skodak/moodle

commit 7395c2b8e29701c9bb4917794833c760cea60994
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:29:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37414_master' of https://github.com/markn86/moodle

commit dff72cde30c1b35df8e1bb59d1d671111c2dda9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:57:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-32750' of git://github.com/colchambers/moodle

commit 0f54ac5698aac75c2dd5701c77f027050106bedb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-19069' of git://github.com/rwijaya/moodle

commit 8c35fcdcd9113e86e00e958e21df6a775e640f40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:08:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle

commit 8af97c2c2e69624d81d269c1c792669dc96cd686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 05:03:42 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35826-master' of git://github.com/phalacee/moodle

commit 9d98cb9f176c51c717d935b380dbe485ced72ae5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 04:54:36 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle

commit 36546841f19afa1ebbb40ca65da23967677e818b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 11:35:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle

commit 0774b0d34c906874d3fe8ea2afb4c093ccffb68c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle

commit 528d2633df88f45175c60998abc95a7e620e3173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle

commit 11a5fab67058bd4c76b1e9cd622adcf773a6a6c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:47:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle

commit 20a31993978c59255473f6508d3327716633fa35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 13:22:04 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle

commit e265716f6973e2746e53b9c211bddc0a55eeab77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:06:39 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle

commit ec16ef1f8563210840f8c4279c6be9b96346c8ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:39 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle

commit 00ba185d52922a6807677baabf851e3cea2bcca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:01:16 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle

commit c8d3475e171cd8a6f62e2157906f9ca4e1f66ecd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 11:30:36 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle

commit 5a3d98c26dc761f4ae2f96d9fa53e8a70fc8687b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:48:53 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle

commit 2a6dbdcaee6c06a969df5e3a83abf64ec36a3f15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:43:08 +0800
Tag:    v2.5.0-beta

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

commit 0fe5a201c035a081be0ce306947b34212c670f4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:37:54 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle

commit ddca5610d314fe41d98cff1290c873d17c01ff26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:21:20 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle

commit ccc89b8235e8ddc9525e6139021c0f7d16feb546
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:12:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle

commit 110178c5c29333341ab839b9747c94121452a658
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:56 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37048-master' of git://github.com/ankitagarwal/moodle

commit f5c51a6d64b561217e915efff37cc2cd58e112bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:51:48 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle

commit 8b2d3f1bef7637f11057e70fc0b5e4e9ef625cf0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:40:06 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle

commit 469749706a2906f5dbdb31e93d3556d19002298e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:24:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36095-master' of git://github.com/sammarshallou/moodle

commit 8d9c15a44eeffcb72acbd3544148e5f3f21620ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:13:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36511' of git://github.com/srynot4sale/moodle

commit 00df8f3f45775353f3200f003ffdd3594855fbd9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:47:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w02_MDL-32387_m25_paypalexpire' of git://github.com/skodak/moodle

commit c2e2da2e69a4e214d68f92fa618bb3f5ed4cf7d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:46:13 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle

commit d9a3d932dbb1ecc930f9b5f111b86b6877a09158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle

commit 9abf0ed1dc6061859bc977987399d0eacf55ef38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:00:00 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-35780' of git://github.com/rajeshtaneja/moodle

commit a0af8cb8c3dfcddade41e5d9613c18b2987f1f6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 09:35:09 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle

commit 6f51092fbee870beb5e32ba1e8d747215c152acb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 06:59:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle

commit 3913743aa3d0a054ffedadaf5422e0b8ade88e01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 05:20:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle

commit 5ba45e34bbdfe0aa1209109be984870b3e6a354d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 05:07:16 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle

commit 21117c9d173e2e54fd513bf0d8b235b01e72e468
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 04:41:00 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle

commit f44e7d0a772514bef53ef480e4f5e5469deb2864
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Jan 2013 04:34:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle

commit b68fb448efc1e84c862372e3459dca200269737c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:07:03 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle

commit c4c1504b44bbe772cda5a751964d86621b03829b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:00:44 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skodak/moodle

commit 70601b94336039c5bab172c64efab18ae590ef6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 05:56:39 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle

commit dd89f61e68e385b5dafa81c62ce4bc2603a2dd6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 10:22:37 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle

commit 8ca9539be5d75a139fe17712ce8eb65e45cff0f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:15:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37161-master' of https://github.com/StudiUM/moodle

commit 1bdc017f422bac75d771f5299386c85540cf1971
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:45:15 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle

commit 816635ff033b2cde0aaae8cbf6cba301af8f7b77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:40:08 +0800
Tag:    v2.5.0-beta

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

commit 68ed412599d933c3d30ef478801b16b80ce135f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:35:25 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle

commit 5fc4ac8549c3c79cf43d98b625970c35fca37ced
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:05:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36855-master' of git://github.com/ankitagarwal/moodle

commit aedad9fcf3d53a3e9f6f0e6ee358cd203bc8aee6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:58:17 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37302_m25_roleedit' of git://github.com/skodak/moodle

commit 99f64911eefa4b9b39c3b0db3b4942d87d216a11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:40:11 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-7660-master' of git://github.com/abgreeve/moodle

commit b8e551a89e08c0c9e7f4032c80e16df386d56b21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:14:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle

commit f27cbf0790d9aa932f97e2cc06f1db79798ea6bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 06:06:41 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35887_dnd_completion' of git://github.com/davosmith/moodle

commit 02ad855adcafc532c938520fb5e7e367fbe1df0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:15:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-16730-master' of git://github.com/ankitagarwal/moodle

commit 9fa3979c1599453743f97486cae070cbb9f08b81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:53:06 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37105_m25_catlimit' of git://github.com/skodak/moodle

commit b33f3d7c4039e2f1f781ac3e67cdbba957caf66b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:47:02 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37359_master' of git://github.com/markn86/moodle

commit 77f3d50d928eb7aac6bc0852c44aa1e5d16d00ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:38:31 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29327_none' of git://github.com/andyjdavis/moodle

commit 083d5f8a48ed4d111a54041b934bc76b95788176
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle

commit 9ae14001aac7d6f25ac674b1e323deb09639e719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:09:50 +0800
Tag:    v2.5.0-beta

Merge branch 'w51_MDL-37315_m25_ldappaging' of git://github.com/skodak/moodle

commit eaf750cd9a123b876a2afac38bd84c05f29cf644
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:59 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle

commit bef123d608193293d9cd8258227a6a132a028378
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:16:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36966-master' of git://github.com/damyon/moodle

commit 486c53f25c567fd10a7d83f4f730c997661b2086
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 05:55:31 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle

commit 296064bb9a1b4972efb1f75e6730dd53a1642dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:55 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35653-master' of git://github.com/abgreeve/moodle

commit fe0980f846c5a7f1df27c2ba1d9da44c957d75ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:34:46 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-37225_static_cache_purge' of git://github.com/brki/moodle

commit d1a73b2add59d718b44b470f291e63c81e6c0bff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:30:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36455_master' of git://github.com/markn86/moodle

commit 9674194eec6377fcd715cb9bcba06001cdadd935
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:43:00 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle

commit 2ea5e39ea3787d7802245f57ee7e7fb363f963ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:40:46 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36490_master' of git://github.com/lazydaisy/moodle

commit 03765b2e9d6ebd7fba1c6d133d2d1c8d0b413727
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:32:10 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37035' of git://github.com/adrianfish/moodle

commit d135b55323896a8afdd755f245f4986a1d63031c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:53 +0800
Tag:    v2.5.0-beta

Merge branch 'w50_MDL-37111_m25_forumsinglefirst' of git://github.com/skodak/moodle

commit a483113178db73e6f99c0fc0704bd313f6b514a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37176' of git://github.com/stronk7/moodle

commit bdd7b01a33b109143cb1b4baa22450d8e5971d95
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:07:28 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35530' of git://github.com/rwijaya/moodle

commit 46b553787c918c22adbc6fe9b568d84053af4ba3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:42 +0800
Tag:    v2.5.0-beta

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

commit a202ead124855b1996d1f81f1c7bd2cbb8798ed8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:46:35 +0800
Tag:    v2.5.0-beta

Merge branch 'WIP-MDL-36812-master' of git://github.com/nadavkav/moodle

commit 740f635b790d6b9a99bd0a9281d2ecdabd2e6e0b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:26 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle

commit fa125570fba2cb693c03fee1e13943a1a708f7e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:10:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle

commit 16ae43f243a32f9eee61c577d2b2ec8e97d09375
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:29 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle

commit db8625bd1e180d2542cf51cca8538c6be10c8bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle

commit 5514e22d52cb6fbabffd7091800c97a7f5c9d513
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:35:27 +0800
Tag:    v2.5.0-beta

Merge branch 'wip_master_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle

commit 18e4963a742dd473ca32ad565ac81f57d4d3232d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:29:33 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle

commit 6e68a3a93c74b9c22e11caac68be2a7c0c1b77ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:13 +0800
Tag:    v2.5.0-beta

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

commit 0aed7e7d7137da978be35651bab5ad782ef59149
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:31 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle

commit fc6acfe242b806c104bae30066c1a6e453ff8aeb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:44:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle

commit 9a8b79864ab51b062cda0113a0646f1e20cd95c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:42:13 +0800
Tag:    v2.5.0-beta

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

commit 159537f65ad07bb643161ee4258c34285ebe47aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:35:07 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle

commit 7a6ef4ee8f871bab339b2bbac6e118e32cc92bbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:27:26 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle

commit 711e0ad9b781bd8718fb7f9e6b0a2a2f6b007967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:22 +0800
Tag:    v2.5.0-beta

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

commit 6c3b271c3d5a7de446e158be8b5538e67721aa6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:56 +0800
Tag:    v2.5.0-beta

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

commit 46c02a6a91b2e56d80b7adeac9f5eef6d5847136
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:54:16 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-mdl-37017' of git://github.com/rajeshtaneja/moodle

commit 9a2a9b146f393472c9a9f83bfdf3f457a8a017f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:44:08 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-37061_m25_invalidlang' of git://github.com/skodak/moodle

commit 0296e662a30c37e5189a0f33a8c900ad832ba1cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:22:19 +0800
Tag:    v2.5.0-beta

Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle

commit 4e0c4ec70d6c69512581435269dce2f210aa8d79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:17:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36263-master' of git://github.com/damyon/moodle

commit a77a8f1e9dd1f1c4898faf55b1ab384abe5833f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:48:05 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37020-master' of https://github.com/mackensen/moodle

commit 3dd842ebfb6f88add44ee486368a7f33bfb63c70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:42:17 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle

commit 5f27d134543067366befe7ce5618421a7402b6f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:16:47 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle

commit 8ebf086d31d1b7c60fba768c60dc1baa77164a82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 03:42:40 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle

commit 845774bf3363de545c7f8c6f18bcb5e5ad96efd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle

commit 754f808546371a10ceb8b88ec1a398f5ed451190
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:43:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle

commit 11e95000bd98652488e0f729254468d30a6c97a3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle

commit d60ac860ea9af8db0c28bc679687246f754af6d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:39 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle

commit 018e659061138b75f0f68a9b23cbbca5977511d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:37 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36978' of git://github.com/lazydaisy/moodle

commit 9a3e76e01e6e8024ce9dee143781b7a1ebd53e63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:16:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle

commit 9d8abffc870baccb463bf9b7726e6e17eaf2247a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:08:06 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle

commit 1b4e47e43a85b7fcc393e7c508daa4b037a66f9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 07:13:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle

commit 8b5944b9b97d23d29fa8544d0ea022e1fef5e282
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:54:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36764' of git://github.com/danpoltawski/moodle

commit a429049ce564f9d289cec7852f5a02bb6551e88e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36778' of git://github.com/danpoltawski/moodle

commit 7e4dd7f6c23614d6f49790212350d67b7bd02b67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:48:22 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle

commit 533469cba40fa3f9fa0bab79153be949198ab1aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:57 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle

commit fa9b53cdf81cec801d85155eda4164d166f230a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:00:17 +0800
Tag:    v2.5.0-beta

Merge branch 'message_nav' of git://github.com/andyjdavis/moodle

commit 70d09e7fd6d5f61e5e0064178ffccf659fa842d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:54:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle

commit f6c922e71f68764dd555323a7f81dc8785f8397c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:49:21 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34591_master' of git://github.com/grabs/moodle

commit d72f2212dae32394d0e6acd1d66a51a14f4a3ee2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:35 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-35221-master' of git://github.com/kwiliarty/moodle

commit bb682c1ac2a53469fa2cd4181251c40787049fc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:48 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36906-master' of git://github.com/abgreeve/moodle

commit 6d48072205348785f1e869a2f4878a6f74f2ba0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:27:25 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle

commit d229ac0f0a61e795d8c7aad97a3464c17aa269d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:55 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37026-master' of git://github.com/abgreeve/moodle

commit 13980de16bbce18cfb1bf5fd964c0bffe93f1af3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:32 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33125' of git://github.com/aolley/moodle