Git merges in Moodle x.x.x by Sam Hemelryk

commit 8abf605ee16739dee66d07659336657dfb6bb9b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Apr 2014 05:26:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle

commit e97b942223bec58afbe408372bef92560519b9f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 07:26:33 +0800
Tag:    v2.7.0-beta

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

commit 6a90bc5e05af4e9f427db3c9446f63df4a32f256
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:37:05 +0800
Tag:    v2.7.0-beta

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

commit b983a5d8692e0e0d4df20d3bb861bd2df86500c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:26:33 +0800
Tag:    v2.7.0-beta

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

commit 6ef3728805762c992ee486d47dc0dac180ea02ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:15:50 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle

commit da98185a58fdbef9d5db73555f7226a128c42464
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Apr 2014 06:09:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle

commit e2a486837fcbfd25c359b897377f2b76a3d54147
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 09:46:28 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle

commit 17c37406b5190cd10e898c85b208428b6b3e299b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:44:21 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44408' of git://github.com/jleyva/moodle

commit 3fb4d8fa8836ba4dd5d4442eb549e5a9dd7eb112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:42:29 +0800
Tag:    v2.7.0-beta

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

commit 2e718bc4bdbaf84a7c7dc9db8d47a9ccb2b86298
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:38:13 +0800
Tag:    v2.7.0-beta

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

commit c1229656db2427ce1c4b57bf41e35904bd935b8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:35:34 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle

commit 652f9a5ef8d9a321cefe483af366ede498760c6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:22:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-36141' of https://github.com/merrill-oakland/moodle

commit 87f2c808f71c35fe06f78b48096da48d5e338fd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 04:59:54 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle

commit 78add102b9b921b187d04ce2bda24274a381a2fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 04:50:38 +0800
Tag:    v2.7.0-beta

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

commit 54c4398a6d880dd99fb079acc9b2880eefe4c37f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:43:12 +0800
Tag:    v2.7.0-beta

Merge branch 'w15_MDL-44882_m27_upgrademaint' of https://github.com/skodak/moodle

commit b017ff6da66d165bfee9751be88cf1b0d5c982b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:18:52 +0800
Tag:    v2.7.0-beta

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

commit 5ee0b3ceaf91f75d94af5b391cb9ecd855c8ec8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:02:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

commit b96bee62b10425de76425bc75125c7f24a57be85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 09:16:12 +0800
Tag:    v2.7.0-beta

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

commit 2429e440116a9723d2f27c93d419631f0376640f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 04:48:50 +0800
Tag:    v2.7.0-beta

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

commit 70aab3836a78fbcd2f14bf8197142a4d4e397f32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 04:15:34 +0800
Tag:    v2.7.0-beta

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

commit e070ffd8abc306e297906afc7aeb5bf6b4c6b456
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 11:37:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle

commit 3ed2a4b2ccac8aa2e168cc1199a3f13d09989794
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:46 +0800
Tag:    v2.7.0-beta

Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle

commit 067573bd0274a0d664f02e12148439032e49603f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:54:33 +0800
Tag:    v2.7.0-beta

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

commit de878a38c8c50ecf4b89a2a00f3fda1a8bd50e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:54:13 +0800
Tag:    v2.7.0-beta

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

commit 8412561a3d3451e65fee6ecc55659e4b45e2cd0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:51:47 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle

commit 53361c3087ac12849b9ec220171845aebc46713a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:43:25 +0800
Tag:    v2.7.0-beta

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

commit 3b07cc1c4ea326eb2f3b25b4aac019e9e58cc289
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:29:11 +0800
Tag:    v2.7.0-beta

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

commit 9b1a4cde78a795199e2d97f4ae882e6534a69246
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:28:49 +0800
Tag:    v2.7.0-beta

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

commit 0ea11b7ceee7a1f61e3d6b65af230f5cdb18039c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:23 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle

commit b9c16d401a25c00fc7c67965596eb4c6bb421aad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:03 +0800
Tag:    v2.7.0-beta

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

commit 4b92f2b79b85292148bc2d51d1daf08f70f64f9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Apr 2014 16:20:05 +0800
Tag:    v2.7.0-beta

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

commit e1190da615032426818a0d77ac60fd70a2f5a7f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 11:35:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle

commit 46c627cf056f76f652a831955b1dd5af5ca0ff02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 08:25:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle

commit bfb6e97eaeb590ed3ad211742486123963e30e25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 06:33:15 +0800
Tag:    v2.7.0-beta

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

commit dcb43ad7ff73afc032621262dd8e74fcba3031b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Mar 2014 06:18:07 +0800
Tag:    v2.7.0-beta

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

commit f94bde7250025b16b08bf6c5ffce1d234864ebd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 11:23:10 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle

commit 11862768ceae3e141a01ca805bd67528a692cfc3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 11:11:10 +0800
Tag:    v2.7.0-beta

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

commit 027d10d67f829a53105a2a906eb66971c9ac6124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 10:06:44 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle

commit 8134eb8573cd0428e8f6e2ef6643dbb1bf613151
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:51:14 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle

commit a4687507236cb04469533c9a283dc6fb171c4974
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:26:53 +0800
Tag:    v2.7.0-beta

Merge branch 'w13_MDL-44511_m27_jquery' of https://github.com/skodak/moodle

commit fe242260639a9c48c22c7df9c38ec322e0e57269
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 03:56:49 +0800
Tag:    v2.7.0-beta

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

commit e23dcd5b94361dc1d3c1f3c96b7a33af560eab0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Mar 2014 05:26:20 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43839_clean_default3' of https://github.com/andyjdavis/moodle

commit 84e8be12e5a9aa653672043ee2baff4a01e3b137
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Mar 2014 10:44:08 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-44552' of https://github.com/rajeshtaneja/moodle

commit 89381287cecdbe1d0b85e7b240e883683d2956ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Mar 2014 10:04:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44608-master-fix1' of http://github.com/damyon/moodle

commit f3516ad3b8d83343cd563216f515bfc962a639ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 12:04:57 +0800
Tag:    v2.7.0-beta

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

commit c98edede859e59a4719bd25ffe2c5a241fdbc9bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 10:00:24 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44505' of https://github.com/bostelm/moodle

commit 319633a0c6821b7f9e4bbdc38c46ba116b8d8c77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:40:56 +0800
Tag:    v2.7.0-beta

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

commit 72d80b598d1ee1b0162d23b75529b0245e000bd5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:35:55 +0800
Tag:    v2.7.0-beta

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

commit dbedde8d8651c70175d7c5fa84ea5f913b8e3cb2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:32:37 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44381-M27' of git://github.com/lazydaisy/moodle

commit b02d88d98cdc8f47c21cd2f4140109bf09d142e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:26:56 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl44499-master' of https://github.com/tlock/moodle

commit 224f8dfda100c72f7ad2b278a0851c601c49b706
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 07:52:19 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle

commit 43301757eb09f3b7b21b5b69a18d85d5318d77ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:47 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle

commit 0406fb9a4bb1ce83410a778949af876fd17aead6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:21 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle

commit 1c6dff6f1c32e116aa683e32668e49e06c52402c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:11 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle

commit 7286f5923d1b6f3ee749f07c7ef3417c2c8f9a7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 05:17:04 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle

commit 114d1ccf32c02ae7f9dae82274d1a8bd3a0005d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:43:42 +0800
Tag:    v2.7.0-beta

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

commit c16fc1946124b547225587690ba2a7e17af89018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:30:39 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle

commit c961d9626e0a5989f3d515de78fb3079f4c95e31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:16:09 +0800
Tag:    v2.7.0-beta

Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle

commit 7aafc49c1871f1b4e2e2baa4dacf9de6078a0e42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:21 +0800
Tag:    v2.7.0-beta

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

commit 9ea57c8bc3b8a286862571adc4678fb45496177d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Mar 2014 07:37:02 +0800
Tag:    v2.7.0-beta

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

commit a8db93c5ace3e6ff8df71b3d850d50b8f09e2154
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Mar 2014 07:10:48 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle

commit 63afbaa6be6ace92439a743f24a09d22947c9019
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:10 +0800
Tag:    v2.7.0-beta

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

commit b679a1760aba70136d7270b5cec869fa8ecf9ac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 07:31:18 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle

commit f3deabee48e6c852833edc28476118433ff2dc30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:56:51 +0800
Tag:    v2.7.0-beta

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

commit 5f2fcc388b568032d0a4ac07142f36bdd34d44cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:21:48 +0800
Tag:    v2.7.0-beta

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

commit ee4655eec1408295215bea10b5e9c0b988129a49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:19:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41173' of https://github.com/danielneis/moodle

commit 1aefc90960908a97569cba5c5e73b26b3e99b72f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:33 +0800
Tag:    v2.7.0-beta

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

commit 8daf8cbc0a7bf9f00721a6163caf24675d585e6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:18:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle

commit 509edd5624c4d049dd57f1f036fba6e24d46724d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 06:54:05 +0800
Tag:    v2.7.0-beta

Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle

commit 421786ed61c1aa57d5f5bb2383e82adedc6a548e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 05:10:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle

commit 2710ad2b520e7543fd2592ae84335240760e09d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 04:19:44 +0800
Tag:    v2.7.0-beta

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

commit 1fef3f6aaca1a738006ebb44b08465c2db04cb89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:51:36 +0800
Tag:    v2.7.0-beta

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

commit c10affa57b218065d29476c2f65d76ba4250c8ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Feb 2014 04:31:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle

commit 38226a3f4a8c9b789c9752ee1e447d94d2c2eb3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Feb 2014 04:30:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44161-master' of git://github.com/andrewnicols/moodle

commit bfb99b7e1d3a657b93d8ee001c3e366ce20325b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:39 +0800
Tag:    v2.6.2

Merge branch 'MDL-44037_26' of git://github.com/dmonllao/moodle into MOODLE_26_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 afbd791a055fd9fe0010751e0e541e68b7abd5b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:33 +0800
Tag:    v2.7.0-beta

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

commit 90e7406e296591c2637b4c3ef074779c8eb4c860
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-42404_26' of git://github.com/dmonllao/moodle into MOODLE_26_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 487f74813e49f334abbe5faaaade05506976d355
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:36 +0800
Tag:    v2.7.0-beta

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

commit 2f31445ff899c0e4fdc50c7babf490b0acfb64e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-44142-26' of git://github.com/mrverrall/moodle into MOODLE_26_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 1fa13df59ea0a21e8b448d2b360245a154f4759f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44142-master' of git://github.com/mrverrall/moodle

commit 0b420fab17384e98ef05fb817be1fae53ae411ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:07:02 +0800
Tag:    v2.6.2

Merge branch 'MDL-44042-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit fa52e6494d3ad06a24f0db91e1ef1513a5ea034b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:06:58 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle

commit a413d15875271873a39769fde84732753f13fc86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:04:51 +0800
Tag:    v2.6.2

Merge branch 'MDL-44055-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 9e7fb3e848015725aa9e294f6c6ac746e77d0f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:04:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle

commit ba0f2d978be295587280f4330cc1a740244ac6c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:49:12 +0800
Tag:    v2.6.2

Merge branch 'MDL-44079-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 87643ff599f0f16e92d61c59b6d335b3dc0718d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:48:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle

commit 3c60db1a842cb8d3623a6f90b0d00a6b1bdbb453
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:28:06 +0800
Tag:    v2.6.2

Merge branch 'MDL-43979-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 80ce7e1a8dbc5c559004453ed398cdd02db58bca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:27:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle

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 a70818530e091e068b4e569e43e1afc7c2e612da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:32 +0800
Tag:    v2.6.2

Merge branch 'int26_MDL-43200' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 7a27c83bc0fe03b4f41ab9666e271d2a15bc6812
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:11 +0800
Tag:    v2.6.2

Merge branch 'MDL-41644_26' of git://github.com/apsdehal/moodle into MOODLE_26_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 e52bbf07a8124ba708b39422a863734ee394095c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:06 +0800
Tag:    v2.7.0-beta

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

commit ae7befec1e5953aba96b26ef80a86cd51ec1f872
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:21:54 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'MDL-43941-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 b73fd8608a000679754318fa4908ee1a896be9df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle

commit 696195afee433eb2e62a190090f5ad260b02e590
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 04:32:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle

commit ec5dc1fab75f1d14bb7fbc766eed636d1b00f3c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:44 +0800
Tag:    v2.6.2

Merge branch 'MDL-43929_26' of git://github.com/timhunt/moodle into MOODLE_26_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 39a0509b68caf5ecf4cc67c13d5bf9e4b6a8c4cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:35 +0800
Tag:    v2.7.0-beta

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

commit 72d953e19eafe4382f44e66fa53bf9b62b0de238
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:58:36 +0800
Tag:    v2.7.0-beta

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

commit 5eb9a4f631f352400e8bf21764b173c80dabf552
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:24 +0800
Tag:    v2.6.2

Merge branch 'wip_26_mdl-32724' of https://github.com/iarenaza/moodle into MOODLE_26_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 c9f5f0afd37fc3c486df700dfa04996da83348ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:05 +0800
Tag:    v2.7.0-beta

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

commit 0527e023906fcf802c1589126efc1ac6a7d999c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:21:41 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges

commit e2b27417dc30967a5fc26645efb30f1e122cca41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:25 +0800
Tag:    v2.6.2

Merge branch 'MDL-43774_26' of https://github.com/totara/openbadges into MOODLE_26_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 8ebaf4bd7401b2af6530ef6a57cd7429a6d89307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:53:55 +0800
Tag:    v2.6.2

Merge branch 'MDL-43267-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 52b7e8aa58d9a794c64a3c8aa2dddf3e773bf5b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:53:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle

commit 7aaf82deb64b5ff479a857b9d5d00a1893923d0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:22 +0800
Tag:    v2.6.2

Merge branch 'MDL-40938-26' of git://github.com/lazydaisy/moodle into MOODLE_26_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 1c8c3a6db19714612ecf20559997fed9b1f1a283
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle

commit 83fffcb97a3c666dbbcbc2e229b9fdd16b026afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:11:36 +0800
Tag:    v2.6.2

Merge branch 'MDL-43200_26' of git://github.com/apsdehal/moodle into MOODLE_26_STABLE

commit 1cb3c0facc54156b2de18c65c3e7200db480e7d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:11:25 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle

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

Merge branch 'MDL-42882-26' of git://github.com/danpoltawski/moodle into MOODLE_26_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 5e45f31d831195908701327dcc21f197e38f970e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:12:57 +0800
Tag:    v2.7.0-beta

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

commit 4acc62f2c41186d93ee3e757bc09384d5ced68bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:50:34 +0800
Tag:    v2.6.2

Merge branch 'MDL-43641-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit e9eb744f6df8363ff02d283ae19471c8c7120f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:32:13 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle

commit e32b3de09eb21ae2c4433ca26eaa074d702780f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:20 +0800
Tag:    v2.6.2

Merge branch 'MDL-44056_26' of git://github.com/timhunt/moodle into MOODLE_26_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 f0c4d4d22eb5c7d21f9474c7d6a03368fe19c1d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:12 +0800
Tag:    v2.7.0-beta

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

commit 7082e945b226ea1d17c716b5644764838bca68f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:12 +0800
Tag:    v2.6.2

Merge branch 'MDL-43838_26' of git://github.com/dmonllao/moodle into MOODLE_26_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 cda0ebf042b1c93418c14c523c3f30049d29f73b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:00 +0800
Tag:    v2.7.0-beta

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

commit ab4ec7a21c586c84f3afc41bf1ba5ad290fc5574
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:48:22 +0800
Tag:    v2.6.2

Merge branch 'MDL-43969-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit f10418699d21a2b5fc97959559590f96177343fb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:48:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle

commit 4e4fabd197b5e351810a3a85db20642ddd9528f0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:21 +0800
Tag:    v2.6.2

Merge branch 'MDL-43992-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 db00b9c8824b67585fc9f7066a17ae058a4f667a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:13 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle

commit 8ef741eeca663b23fd89ef12b842fd9166fe4ed3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:04 +0800
Tag:    v2.6.2

Merge branch 'MDL-44020-STABLE-26' of git://github.com/jleyva/moodle into MOODLE_26_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 872b051fa38a0f512c793317f895253bd0746462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:30:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle

commit 764d330c3efc75594ed7bb94d669941a8dffebb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:19 +0800
Tag:    v2.6.2

Merge branch 'MDL-44046_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_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 52aa25fd416df6414d1549f8db3a2f906e5e2c7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:08 +0800
Tag:    v2.7.0-beta

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

commit a95a35632279fb84898e3a78b9156a6ba8caaefb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:24:01 +0800
Tag:    v2.6.2

Merge branch 'MDL-43978_26' of https://github.com/totara/openbadges into MOODLE_26_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 fbf1f6fdeaa85b3ce2497f447b1435135e0d4b43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:23:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges

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

Merge branch 'MDL-43994-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 642ad27297ff6f9e422193782a696d1e1075e9f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:31 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle

commit 179ddd105ba83cbbfa51c641c7eeef1b367cc549
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:50:23 +0800
Tag:    v2.7.0-beta

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

commit fdf33244b503504f8284be622593ae775c8dc7ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:56 +0800
Tag:    v2.6.2

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_26_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_26_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 705c5e0aeda4d5ceff20561d135904ad8d71d826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:39 +0800
Tag:    v2.7.0-beta

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

commit 3b6aa4f70cee3738e47be205a21e1feca1c8661d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:43:05 +0800
Tag:    v2.6.2

Merge branch 'MDL-43946_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_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 065bc30c8d534111f77789fb7fffdab17bd18453
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:42:55 +0800
Tag:    v2.7.0-beta

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

commit b1733dc795ba597781d53226e7bf41eb259e9d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 07 Feb 2014 06:45:55 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 155771cb4bcca6235e465733a4ce5ac54268aa06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Feb 2014 05:04:06 +0800
Tag:    v2.6.2

Merge branch 'MDL-43936_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 37a079acb57a379b1a2b22e9e57576d984f5d22f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 06 Feb 2014 05:04:04 +0800
Tag:    v2.7.0-beta

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

commit d9fece93d009ddc1c0130df6c2c79407b52b24be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 07:36:52 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle

commit 8213574043505acc276150ff9be13c415a2c75c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 07:35:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle

commit 3ec0946e100665c9bad0d7bfd8bef095d3f43c69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 06:44:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle

commit 13de6099c1fad20743d71c4219bbed2231c6cb05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 05 Feb 2014 06:29:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle

commit aa01949f24d2cdea8785dd026a93d17294469401
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:50:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle

commit 82bef99867baba932526073c2ac250dea2d5ad63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:24:02 +0800
Tag:    v2.6.2

Merge branch 'MDL-43369-26' of git://github.com/jamiepratt/moodle into MOODLE_26_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 5c876ed21f174fe6c9206e56c4e0b525a0828e80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 09:17:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle

commit 2f166b3284d898e586cfebdf01ea71cef1ce8799
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:41:00 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43885-master' of git://github.com/andrewnicols/moodle

commit 93289de65eaf602c1bb4217ca1870248f2b05be0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:28 +0800
Tag:    v2.6.2

Merge branch 'MDL-43885-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 68ad9d82bf5040aa3dfd04623bb49f93738b6d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 06:14:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle

commit 5dce0f2a1aaefca6ff68f15637591af9eab694bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:37 +0800
Tag:    v2.6.2

Merge branch 'MDL-43892_26' of git://github.com/timhunt/moodle into MOODLE_26_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 1331241bf4eb3e2c738742982a4206354ed73865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:26 +0800
Tag:    v2.7.0-beta

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

commit 90c15466d8467c7309cc609b554539c7d7366c42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:09 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-33920-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_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 527dd78d369b629e9956c5b7213ad31d611a6ce0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:00 +0800
Tag:    v2.7.0-beta

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

commit 5666a74c91c8889fd65c4a2ca16b6720247cc75c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:23:24 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle

commit 5eb041021e51ba67649cc0e0f2a9ad18de4a84a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:22:42 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle

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

Merge branch 'MDL-43936_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 4a30b40069598a3b5e3c49b78c1a7aab3628aacc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:11:44 +0800
Tag:    v2.7.0-beta

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

commit 7c8c6aa76b7adf98a1fa043d6486f7729edbdf69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:53:16 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle

commit 2ad02f9c91a62947026968d31b9f7f45bd526a48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:41 +0800
Tag:    v2.6.2

Merge branch 'MDL-43884-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_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 b2ca12e9041cdad9c24a23f292a28e6402a4ba31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:27 +0800
Tag:    v2.7.0-beta

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

commit 6bdf77c1913cf1b10cee7cbb05f7e75108e40b62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:41:37 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle

commit fa0b936d59628a34927ddb3dd856cbd05d825b00
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:17 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-39942-MOODLE_26_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_26_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 6958c718cc9ba90172d366d68f591cd9b6c799ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:28:56 +0800
Tag:    v2.7.0-beta

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

commit 453d66b782f01549fc0454678a6365eb7f09fce3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jan 2014 08:21:00 +0800
Tag:    v2.7.0-beta

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

commit 07481c927748ea56e8b3da91c3a7be44f76a23af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 29 Jan 2014 03:23:51 +0800
Tag:    v2.7.0-beta

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

commit 9681639337c3cd9aaeacacffa9f0d744f40f3967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:26 +0800
Tag:    v2.6.2

Merge branch 'MDL-43246_26' of git://github.com/timhunt/moodle into MOODLE_26_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 9123721e4f005a0a7a9ed5a58e5e25d78343554e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:20 +0800
Tag:    v2.7.0-beta

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

commit 83bfad45a54349509698ea2df67de39820bfa432
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 03:40:48 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-43643-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit c77d28e5b25b77b290f2c3fda0a029255c7dcf76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 03:40:45 +0800
Tag:    v2.7.0-beta

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

commit 049422651c87f93e5fde78f415ef40a17186893e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 10:28:47 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle

commit 068ffec81b77375be9668d09a17f4a67a1396219
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 09:30:57 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle

commit 250611b579f46769324ff8c9af9f045d2e255d4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:25 +0800
Tag:    v2.6.2

Merge branch 'w04_MDL-43746_m26_courselogin' of https://github.com/skodak/moodle into MOODLE_26_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 9299144461c1dd79836acac11748bb1fe97dfed3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle

commit 5ccfa402920f5a9c95d32f943c6dd8ccf216f5fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:16:15 +0800
Tag:    v2.6.2

Merge branch 'MDL-43794_m26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 00dfc95708f599090263319511858e7ddbedb428
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:16:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle

commit 7c445ab8c0bb0e95e5c35193bcba2a0e1c0a4114
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:46:31 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle

commit 8e06909afdb87e728130342013f2b7851b665a75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:19:11 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle

commit 98f0074fc59d40904016f8c794979a12fe51a201
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 09:16:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle

commit e4ac256c35394d46d530cf14288680cb76f26bc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 08:09:42 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle

commit e6d3f9438e1ef6c4483698665d25923ee66c7369
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 07:01:54 +0800
Tag:    v2.7.0-beta

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

commit 61a79e01fca1bc2ab446d6d84518e1a5ffead919
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 07:00:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges

commit a9bd004c8cb0af366942e6f784b247d5769a51b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:34 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle

commit 0cb1903bfd7027e5ce5b62a95aa8c2baf54bcb0a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:28:25 +0800
Tag:    v2.6.1

Merge branch 'MDL-35973_redirect_26' of https://github.com/andyjdavis/moodle into MOODLE_26_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 9b94e327d301da05222b037f851a749ea91236bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:29 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle

commit 8571b889f37c13a77cdc4cbd68797c2cc18012ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:22:09 +0800
Tag:    v2.6.1

Merge branch 'MDL-43281-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 b8ac884f9dafe889cad227eac2c0fdb6ea3181ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 06:17:47 +0800
Tag:    v2.4.8

Merge branch 'MDL-37962_beep_24' of https://github.com/andyjdavis/moodle into MOODLE_24_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 f29dcf642b614ea2cdaa815e8ab3ada31f72eed0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:31 +0800
Tag:    v2.7.0-beta

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

commit ec9f2a7d3f10bd9582d860ff13fcc871199443a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:30:13 +0800
Tag:    v2.6.1

Merge branch 'MDL-42212-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 6e2745d23865d41e654741df0f735e4ee990fd9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:29:55 +0800
Tag:    v2.4.8

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

commit 97e9098927830a68b75aa3964f1b242c5c09d2c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:20:39 +0800
Tag:    v2.6.1

Merge branch 'MDL-42801-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 62b4ddc29473bf1d47a928deb28fb3448f343acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 05:19:20 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle

commit dfed81ae127707bafd9591055bcea4056822e885
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 04:53:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle

commit 7404bfd003972da127a104418f6fe9195539a251
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Jan 2014 04:11:32 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle

commit 910dc3393cf3cd05c98182bb9a5aa0c0d66d977d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:46 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_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 52c4f06af320768f0df30838a8db2f8965360321
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:34 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit a89ce4309164c2b703298d91c44b215663c277e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 12:17:26 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 69f86e87a7e897f2ae5e67f850a5e978b61dd15e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:22 +0800
Tag:    v2.7.0-beta

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

commit 5ac473e356d45d64053edc4c7853d606b7227216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 07:52:02 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-41788_M26_3' of git://github.com/gjb2048/moodle into MOODLE_26_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 946e770ede05a7c26faf3c4e9d5a3c9705350b40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:56:01 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle

commit 24bf5af4b7efe20bc68d79bb8d86df45dcd2989a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:48 +0800
Tag:    v2.7.0-beta

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

commit 10beedc18fac2e58f90b5786d37eb3bf94fc5160
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-41246-moodle26' of git://github.com/StudiUM/moodle into MOODLE_26_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 27b1ba527a481c16ab7b38f5f22bd5512edfbb0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:41:15 +0800
Tag:    v2.4.8

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

commit c5213d7e6ee335cd1c2a066d22da62e0325560f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:15 +0800
Tag:    v2.7.0-beta

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

commit 83797afa91f6baaf6403ba5e01def69dcfff6d36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:23:06 +0800
Tag:    v2.6.1

Merge branch 'MDL-43438-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 085c2fd228fb17e08eaebe4e189b08e615cb2900
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:22:37 +0800
Tag:    v2.4.8

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

commit 235b5a0c1dbef6fa9e0072382d02e868bee4e2a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 06:03:51 +0800
Tag:    v2.4.8

Merge branch 'MDL-43250-24' of git://github.com/damyon/moodle into MOODLE_24_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 d3220e229efa591bf25d6374bc5c40a838b8dc70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:44:04 +0800
Tag:    v2.6.1

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

commit ee70f10f99dc62ddbc2125fd5338c5617feb0d3a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 05:36:22 +0800
Tag:    v2.7.0-beta

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

commit a92617fa3f7c33e8b7914dd1792781e322470d5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:13:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle

commit f2b1768da677d0d3dccef8add3d196246a69c978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Dec 2013 04:12:47 +0800
Tag:    v2.6.1

Merge branch 'MDL-43410-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 6ac16bb9811a68a2047b2124817f4e5a3f47ff68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:58:04 +0800
Tag:    v2.7.0-beta

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

commit 1c5052e29fdb5b22ebf1f056327ce91104b5127f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:49 +0800
Tag:    v2.6.1

Merge branch 'MDL-35032-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 7f4fa839fe039f130abb5db7115366fbc6c34e9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 10:57:25 +0800
Tag:    v2.4.8

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

commit faf4e51da9f5190884faa18becffaaa3b9f09367
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:24 +0800
Tag:    v2.4.8

Merge branch 'MDL-30195-24' of git://github.com/FMCorz/moodle into MOODLE_24_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 61dde025a16de04aed8703f8d267ba1e7dd529e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:35:07 +0800
Tag:    v2.6.1

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

commit 4a91dfdb0864de9489f4a6799a0f5dca142fa3eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:34:35 +0800
Tag:    v2.7.0-beta

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

commit 4cec4ee627d6c9fd3a5363c9fa94a390e211a527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:58 +0800
Tag:    v2.7.0-beta

Merge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle

commit b10fec175071ebe99c34822e0103187d3eaee278
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:50 +0800
Tag:    v2.6.1

Merge branch 'w52_MDL-43367_m26_contextpath' of https://github.com/skodak/moodle into MOODLE_26_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 a7dae3ef8ea5ef1666705e3d752f39f8996aea59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 09:31:18 +0800
Tag:    v2.4.8

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

commit 5c7e16db54eab8bdab55faad5a037e3fec706232
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 04:54:44 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle

commit 8ca4f69539a7f385c8c12651b848d9ed17b2f40b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 04:54:26 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle

commit 2347fe54507776a201741ae541d48b4acdb21556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:50:48 +0800
Tag:    v2.6.1

Merge branch 'MDL-43325-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 43d6e05c24d85c30d17c4392498de32e81e71b2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:16:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-34182-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 a35428cf86004d566ed262109c23afcfe2b8a2fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Dec 2013 03:15:48 +0800
Tag:    v2.4.8

Merge branch 'MDL-34182-24' of git://github.com/andrewnicols/moodle into MOODLE_24_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 a0e11687513e33e25f773b3cf49a21307c0aae71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Dec 2013 11:12:46 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

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 2415e85716684ed3e2685eb91e6de4e3a67769a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 11:26:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle

commit 47358bdaa58599dc6e30db90e48990e38a3d6dde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:59:28 +0800
Tag:    v2.4.8

Merge branch 'MDL-42104_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 272e4400907b1188f1a48c6ac7d37edcf9d6ab8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 06:19:34 +0800
Tag:    v2.7.0-beta

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

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

Merge branch 'MDL-43235_26' of git://github.com/dmonllao/moodle into MOODLE_26_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 2df83c2ea891746f412b24ea1c8e7d73a4b52e5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:52:41 +0800
Tag:    v2.7.0-beta

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

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 6a8e8ac25ede25224f0b0bcb2dc77f43fee2433c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:45:02 +0800
Tag:    v2.6.1

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

commit adfcdcb0276452330eab23bc203dcc48ac6ee5ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:30:30 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle

commit 37f59a68bd63f88cbb7a3e8075c334cb82e5765d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 05:08:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle

commit 9b4c44c8e6cc5e3db6958fc27fa1e53c5c8affda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:59:05 +0800
Tag:    v2.7.0-beta

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

commit f01cac675a1bdee1c7d65011c8024ce16b3a6c3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:58:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-43074-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 04102046ef34802b8260c4c870d66a0183b93c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:55:04 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle

commit bf6529bbd42ea4ec168a98f15e92a01fa6fc0704
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:53:02 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle

commit 5be3d8d32908bb46c75115843b667277b5c096aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:50 +0800
Tag:    v2.7.0-beta

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

commit 3aa576a8ef7087e203cf5ecc15ab6cf1d42f69f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:31 +0800
Tag:    v2.6.1

Merge branch 'MDL-38698-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 a39ff69d58b7a82df6fd63800299c4964219e340
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Dec 2013 04:21:10 +0800
Tag:    v2.4.8

Merge branch 'MDL-38698-24' of git://github.com/FMCorz/moodle into MOODLE_24_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 233e6b985ba3103b8ba6ddba1e888bd57282454e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 11:32:35 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle

commit ca3b2c9bcc481a2f1d79c2b17b8791ad0d37c567
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 11:20:34 +0800
Tag:    v2.7.0-beta

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

commit 9d771f95293df401533218a75ab1409aded3e722
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 04:31:19 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle

commit 2b88fa0c90f17a11a990f286194a42a38fd9b369
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:33 +0800
Tag:    v2.7.0-beta

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

commit 21bb4f142c84866054e8fa35f8f971d7df363678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:54:22 +0800
Tag:    v2.6.1

Merge branch 'MDL-25473-26' of git://github.com/phalacee/moodle into MOODLE_26_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 1b5fea23bdf9d3d1ad210603bbbd0c521852dc46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:53:38 +0800
Tag:    v2.4.8

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

commit bb4551334fb3a3312bab9bbc3f9556891e9a677c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:48:08 +0800
Tag:    v2.7.0-beta

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

commit 7809633d79c37a6c3a81242c69dda5adaa7038a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-34321-26' of git://github.com/phalacee/moodle into MOODLE_26_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 00621ce929ee5bd2f9a04e306d813e78bd36391c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:47:26 +0800
Tag:    v2.4.8

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

commit 2b08f90aca1e8417647b1f6aa49fcec0e19ff0b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:45:05 +0800
Tag:    v2.7.0-beta

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

commit 7f574aadffc47a4d8f7f404d67ba08816cfce8f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:44:52 +0800
Tag:    v2.6.1

Merge branch 'MDL-36984-26' of git://github.com/phalacee/moodle into MOODLE_26_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 0359fe71e28844a3884805d09e2525d79fa86fbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:25:08 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle

commit 9c099d21eb9952025b28cd414f458e795405a2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Dec 2013 03:24:52 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-43268_m26_filternotice' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 21ad9a7921f380da79f18857b966fa4f9de9d356
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 11:03:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle

commit 9f5b319345fdc98f7778a01a74060868fa009330
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:46:56 +0800
Tag:    v2.7.0-beta

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

commit d431ff1f513a40b9353c5b2cff3b8e4216051207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:44:15 +0800
Tag:    v2.7.0-beta

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

commit a3a8490d3a8779b62a29fb7ed324d09aa359b9f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:47 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-21180-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_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 4d3ee68536d9f312b9e2851d11c6a109b98cab29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:43:12 +0800
Tag:    v2.4.8

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

commit d84268502872fc83dc7aa6a25ae760d3cbab16f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:40 +0800
Tag:    v2.7.0-beta

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

commit e9623e55e31a30eb888b734a768f92811fa0aabc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 10:40:25 +0800
Tag:    v2.6.1

Merge branch 'MDL-43062-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE

commit 3c3eed7e01bcd505fa0fa15b3633528e0eb9dd72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:10:15 +0800
Tag:    v2.7.0-beta

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

commit e646b89f8b83a41eda7e413f744a8e6cf64857b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 09:09:52 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43348_M26' of git://github.com/gjb2048/moodle into MOODLE_26_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 3b94d80c20603a0a3a9bb955fe6bacdb2b0be789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:16 +0800
Tag:    v2.7.0-beta

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

commit a0f5d96f1e44b1cffe8081632c36b6d0575968a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:52:03 +0800
Tag:    v2.6.1

Merge branch 'MDL-40096-26' of git://github.com/damyon/moodle into MOODLE_26_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 6a68b92cff3cd7c9f04e4351b4c426ed4287edee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:50:44 +0800
Tag:    v2.4.8

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

commit c57864b76f788ea6b184c84461781ee9ab98c9c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 08:47:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

commit db23e92670658ea5f55cdffd898731909997cb2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:29 +0800
Tag:    v2.7.0-beta

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

commit 45c058331283a707f965648923b28bc8ad23aa2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:31:13 +0800
Tag:    v2.6.1

Merge branch 'MDL-40436-26' of git://github.com/FMCorz/moodle into MOODLE_26_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 1ce52ce8db41f7d0a124b78ae8b9c2351b9e1560
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:30:14 +0800
Tag:    v2.4.8

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

commit 224428980963d4d5be2d4b0c18ace24d9e667f22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:18:02 +0800
Tag:    v2.7.0-beta

Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle

commit 05a423d850b2c47eb3319592da483a4f31e39e02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:46 +0800
Tag:    v2.6.1

Merge branch 'w51_MDL-42931_m26_env27' of https://github.com/skodak/moodle into MOODLE_26_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 7d07632f7a421404cd11b10a018746d6d1dd1831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:17:19 +0800
Tag:    v2.4.8

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

commit 063baa62b5c36cdcd53b16b6afc5b3ef5af43223
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:38 +0800
Tag:    v2.7.0-beta

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

commit 12869bfdb12649b0793a27d19e699366cf6e1148
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:26 +0800
Tag:    v2.6.1

Merge branch 'MDL-42085-26' of git://github.com/mouneyrac/moodle into MOODLE_26_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 34965b0d31ba03caa6190725010da8eda8127a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 06:11:05 +0800
Tag:    v2.4.8

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

commit 6015500d5be96192758961d2a316b7fbdd9fe471
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:47 +0800
Tag:    v2.7.0-beta

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

commit 909f01f17ec13117216604d0e62ff3dcc211e204
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Dec 2013 04:46:32 +0800
Tag:    v2.6.1

Merge branch 'MDL-43326-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 40d3bc442fba7a6af145a457dc54dad3818dc576
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:31 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_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 ebe7179a88356836492628453de0f54d200cc120
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:16 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 61b46e4c4d343e5191d478b61ed7bd6730d6fa33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 13 Dec 2013 11:59:08 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 623d49dde472aec86973618b31697e9d46c13540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Dec 2013 04:13:42 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle

commit 445e63ecd8b2b5d052949cb30269bc7ea745967a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 10:32:29 +0800
Tag:    v2.7.0-beta

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

commit e453c70d143d2498f8455e3c45f2bc8fe46f6840
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:30:26 +0800
Tag:    v2.7.0-beta

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

commit 1092f63a80eba5c6476e753967add15f31c99b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:16 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle

commit 5cc0c2c41d9b917680179ccdc29b907c908c932c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:14 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle

commit 745801263713cae829aa72f60fa6df8ea5c1c077
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 07:25:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle

commit df1498f711bd173787dc1326c7b94287bcad3388
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:13:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle

commit 5fbc32ebdbdad279c6731b6f9b8c1bc1aea53124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:12:55 +0800
Tag:    v2.6.1

Merge branch 'MDL-42796-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 87176b481e091158839d1616668469dbd907d302
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:39 +0800
Tag:    v2.7.0-beta

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

commit 9f00dabf864562889491014344d8b1f000a21c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 06:03:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-43252-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_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 78144bd2e71da72ab010d11432553053fb3fc407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:59:21 +0800
Tag:    v2.7.0-beta

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

commit 51d311f703f2c9fd146d7b25dd2dc7306102ff89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:58:49 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43279-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_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 133870d7595f1914392a48d30592d37df94553c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:57:46 +0800
Tag:    v2.4.8

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

commit 3ef86b39098ea54f8d869a7493ec6ccb746b0c98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:51:21 +0800
Tag:    v2.6.1

Merge branch 'w50_MDL-31625_m26_replace' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 3f35f367cbf80384dbb8b285bf0fa5a797a425a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:50:07 +0800
Tag:    v2.7.0-beta

Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle

commit ebb9daa5e1cf196b6f7fde63ed5127a867d1f80b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:34:17 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle

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

Merge branch 'MDL-42959-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit b6df1b3ab36e7aef65e82cf03f32ad2ba446144f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Dec 2013 05:32:06 +0800
Tag:    v2.7.0-beta

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

commit fd0281dfc3461cb23580eda9ecb8d7364044a987
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 05:27:45 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle

commit a88c1ca91a4112b9141e48ac6629d896ec2db65c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:52:08 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle

commit e5bb9741b646b2fece10177c19dc75e1a9557a12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:50:27 +0800
Tag:    v2.6.1

Merge branch 'MDL-43164-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 176521e560a3e91eb2b2117a401c4465a6eb6e5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:25:51 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle

commit 830299fe4f15f30cb7f5858443b87aab7f2e1d3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:21:10 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle

commit c7f545bbb0dd713e063df5738c8e497ea563a8c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:20:33 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle into MOODLE_26_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 8f2bd073aaeee80cbfa46084ae922fcdf4edef83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:09:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle

commit c8d6ee98702117830773119ddbe0b89b8f8718ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:07:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle

commit 437fd401f92a6032892c23006f39ad81f8bf13d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 04:06:54 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle

commit b78f0294bb1fff2f91c67f61ae9fcff9e7be7634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle

commit b2a803d5d1620641c16b35ceb81b4df194ae4917
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:48:04 +0800
Tag:    v2.6.1

Merge branch 'MDL-43194-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 822f52901407dbe55fb305afd330c9255e051082
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle

commit 8eb717f9936970bfbc55e4895cc0d7541056b16f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:43:36 +0800
Tag:    v2.6.1

Merge branch 'MDL-43152-26' of git://github.com/andrewnicols/moodle into MOODLE_26_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 e3f7ac09e7cd6e2be6a498bcdf31aa82b713466f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:36:39 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle

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 71e7d2552b8e8470c952bc00eb5c7b3dbd4be4bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Dec 2013 03:28:35 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43019' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit ec6219a2e7a2d38c458cbe8d458a0393ee78ba32
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Dec 2013 03:25:35 +0800
Tag:    v2.7.0-beta

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

commit ba9935866a3d617edeb16a65ffe4ff0223a4b608
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 Dec 2013 03:07:59 +0800
Tag:    v2.7.0-beta

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

commit 5ba212b4445d3e825fefafd8942fc755d969b84c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 10:29:00 +0800
Tag:    v2.7.0-beta

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

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 8e60097af88ff17a5f4e739882889c6d48202c59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:18 +0800
Tag:    v2.6.1

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

commit 5d288a5dbbbf1b0f0efc2de54f286bd9aa0d17f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 06:52:12 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle

commit 12f46583f00be0291a45b46ac9a42ffb90bb1e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 05:12:12 +0800
Tag:    v2.7.0-beta

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

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 4f1342366344cdc7289e58ec4486f19e73420124
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:49:29 +0800
Tag:    v2.7.0-beta

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

commit 2a336e2a36f0360d45fa06e2242bdba59793cbc6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:44:25 +0800
Tag:    v2.7.0-beta

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

commit db9c8f4c7d6b1a970990a2c1f334f573bf85764c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:43 +0800
Tag:    v2.7.0-beta

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

commit f5a134213d18812576a75109b565a5a21a94344c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:43:24 +0800
Tag:    v2.6.1

Merge branch 'MDL-43065-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit 7ac957682535fdf3d40ec719ad67e0ebed9c18c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Dec 2013 04:42:34 +0800
Tag:    v2.6.1

Merge branch 'MDL-42919-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit a59a423926c0688954ecc6e70e011179ce430438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 06:12:34 +0800
Tag:    v2.7.0-beta

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

commit b5fd2497d66eab81293067002c3366d74ca7f347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 05:25:26 +0800
Tag:    v2.7.0-beta

Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle

commit 1cb0536bcb106f0686fecdd1cded0a3331e1c545
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:58:10 +0800
Tag:    v2.6.1

Merge branch 'w48_MDL-41819_m26_maxinputvars' of https://github.com/skodak/moodle into MOODLE_26_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 dc76ce70b232c40cb443859785da2462b1e5fef8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Dec 2013 04:57:03 +0800
Tag:    v2.4.8

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

commit c619d3d48d92077a01cbdcd71a87f85464565db6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 09:04:09 +0800
Tag:    v2.7.0-beta

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

commit 12539749f478643be9dfeee987e52f71aa298eea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:44:05 +0800
Tag:    v2.7.0-beta

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

commit f098ca6d97808ceabfff929218a2bcc19f9e1ca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 08:39:51 +0800
Tag:    v2.6.1

Merge branch 'MDL-42918_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

commit f2d7e2dca9b95c50acea30ba26ba84cc1cdd3ac5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 05:52:11 +0800
Tag:    v2.7.0-beta

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

commit 06ef842707c0b2679f1cf80910b66ec0dbf7e32c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Dec 2013 05:35:46 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle

commit 8d5a9d6ec11990536f2478c5e7980fa0d7158452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 27 Nov 2013 07:36:02 +0800
Tag:    v2.7.0-beta

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

commit f9cb086dfc0107d3b078655e643930183d0c0e79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:42:25 +0800
Tag:    v2.7.0-beta

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

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 10123d02f6c4c5628de02baf7090c513c265ce9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:41:48 +0800
Tag:    v2.4.8

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

commit 657b29e7bcd2295fef816f7e608170d5ffe4bcf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:36 +0800
Tag:    v2.7.0-beta

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

commit 390896d3d95671a670a58172aafdfdcf8f038509
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Nov 2013 03:36:09 +0800
Tag:    v2.6.1

Merge branch 'MDL-43037_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 417d6f51cc246a13bc414b584a5e73bbd6b8ea16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:37:28 +0800
Tag:    v2.7.0-beta

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

commit 8b5e008bc22152d977012bcf238705c691219902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:31:51 +0800
Tag:    v2.7.0-beta

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

commit 496692fb9d5f16e1665e92bd181a83d4a90bb021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 09:19:20 +0800
Tag:    v2.7.0-beta

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

commit 40dca7e4d69cfbd18c34b0b30999ae701d4ca795
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:28:08 +0800
Tag:    v2.7.0-beta

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

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 12bba6cc09421cadf58101481911f04a71c90e86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:27:45 +0800
Tag:    v2.4.8

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

commit 35a197898552c2cdcd6a95475f0dbe2c797b4fb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:24:56 +0800
Tag:    v2.7.0-beta

Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle

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

Merge branch 'w47_MDL-42612_m26_paypalruble' of https://github.com/skodak/moodle into MOODLE_26_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 40ce744d0871286084909c0e7c79f41388bc8687
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:06:29 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle

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 074e5686db18805493a9644c5961ee78ba6e8c5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:41 +0800
Tag:    v2.7.0-beta

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

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 c53ee31d464c86f2095ca7f1bd02ca597e9eb952
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 07:03:14 +0800
Tag:    v2.4.8

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

commit 04fcb4a96cbb8ce006078b996d20458e7e2eb2be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:44 +0800
Tag:    v2.7.0-beta

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

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 7bfd34244580e867bc6c8d6712b78369cb81ebea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:50:23 +0800
Tag:    v2.4.8

Merge branch 'MDL-42865_24' of git://github.com/timhunt/moodle into MOODLE_24_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 d7a0da37d9f031bd14d9ddf7ea480632bebc8f01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 06:42:25 +0800
Tag:    v2.7.0-beta

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

commit 1098226524271901dc9051406cd2b650ce121e05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:15:33 +0800
Tag:    v2.7.0-beta

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

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 64b4fbebd85a3155c234abd046efe65e9e5925aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:09:18 +0800
Tag:    v2.6.1

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

commit 34592ffd98e998d8544b4624b40dd60e52e3008c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:08:45 +0800
Tag:    v2.7.0-beta

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

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 7d181fd82dddad87e28aacecb939c4b7d1e8bd14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Nov 2013 05:07:49 +0800
Tag:    v2.4.8

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

commit c31fc5a099055bddddf01710d56555f9816ee307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 16:30:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle

commit b8a598ad6591ded8c436430e5a5d43fb75969f72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:53:08 +0800
Tag:    v2.6.0-rc1

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

commit 0ac5863d862e5b00d65ee22ec95c0f9de9e1218b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 13:20:12 +0800
Tag:    v2.6.0-rc1

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

commit 6f4a169d8e50cb77561caa8e9d9e3351931c7549
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 12 Nov 2013 11:34:39 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle

commit 68bcc3faaf722d3da4fb83892cd61d959e468fe9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 14:10:21 +0800
Tag:    v2.6.0-rc1

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

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 0fd6069ecd81eee278e54bebc3d32e1e191653a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Nov 2013 13:10:44 +0800
Tag:    v2.6.0-rc1

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

commit 16a14e4a5f2b19f725dbfdc9d0da81033526bae1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 07 Nov 2013 11:29:57 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-MDL-42739_M26' of git://github.com/lazydaisy/moodle

commit 8e23283cbbbfa761299cbafecb8e681bea0b21d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:24:46 +0800
Tag:    v2.6.0-rc1

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

commit acdb2159fb59ade51e21c23b2046b7249719597a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Nov 2013 14:00:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle

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 9620bcebee54514f267607871cd6570fe0138504
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 16:00:30 +0800
Tag:    v2.6.0-rc1

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

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 ab4fdbdf42416be9ad9be3f9cff0cd3c2d2296fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 14:15:44 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42284_behat' of https://github.com/andyjdavis/moodle

commit 2e29034313f5d43287553d7e7c00a6141a7a5cf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:56 +0800
Tag:    v2.6.0-rc1

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

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 c3673c5531face85e6bbebbddf3d126a3109d436
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 13:44:39 +0800
Tag:    v2.4.7

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

commit df2d3777ccbf02329d605619b91ca6025bbc1706
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:40:08 +0800
Tag:    v2.6.0-rc1

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

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 1f26c7053ad9d68b696073ab33b280989f14490f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 Oct 2013 08:38:47 +0800
Tag:    v2.4.7

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

commit 28fef14840ed48687e07986a32ab972e430a279b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 11:06:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit c80ef689d5c07a1d926bab4411cc1f491978734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:40:02 +0800
Tag:    v2.6.0-beta

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

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 49e3cda704e59a63aab59e936b1b25039e0c7d88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 09:39:24 +0800
Tag:    v2.4.7

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

commit 2dc15b1011f26a161a9d0a3c3451e6668993f4ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:37:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit 2219f50a103eac8d44c5cda7b66f650e953ab28e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 Oct 2013 03:34:11 +0800
Tag:    v2.6.0-beta

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

commit d00b3f19b9e8cf726b49cc4e9df9cbb1c0974d11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 11:25:22 +0800
Tag:    v2.6.0-beta

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

commit f18f96f767af3ca4cbd6e12e6cb0ec6e990217eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 10:57:30 +0800
Tag:    v2.6.0-beta

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

commit 571781fbf6337468aa1ce83cbf4da5af8af6b5f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 07:41:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle

commit 08f95ac5e5b6f52466a5bc950a7b58d1ae3d4ae6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 04:23:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle

commit 9d1b909a9c8ae247f58bda982bba6f5c50370cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 Oct 2013 03:54:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges

commit ff8e2578676dd39c7d38624e35493f573bcdd8ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 11:04:05 +0800
Tag:    v2.6.0-beta

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

commit cbf34f34cccbe5200b580d0fc853124c981b52a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 09:43:36 +0800
Tag:    v2.6.0-beta

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

commit 87f28ddceb41330d6b3850a06d1b13f4e114c62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 06:20:51 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle

commit 8050eec577a7341935e47385e938d5a63658cbec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:52:42 +0800
Tag:    v2.6.0-beta

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

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 6455dec02db8c0b45a762ed7905a26abb2cc6f3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:48:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle

commit 81a939be02a787094f04c3c04babe1bcdd2b9b09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Oct 2013 03:27:46 +0800
Tag:    v2.6.0-beta

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

commit 4d00df46b19132fa0abae690a4f5ff3bd7569e53
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 12:38:25 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle

commit 8618757c66b1e206b9d87a9b169ff35522961469
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:51:45 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle

commit 6ac0b011759e3b1f3eccd85386325c83e715900e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 10:40:48 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges

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 4c9da232d05f324d4f077aace13393b2da7b2c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 08:43:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle

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 d6cb394f2c749b3ed2f961550885f556f1ecef94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Oct 2013 07:50:29 +0800
Tag:    v2.6.0-beta

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

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 577fc805a200a826490dca96d9aaf38e34235474
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:52 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

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 d0012b72ad366dd3a66192ed672ea1349280e60d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 10:43:38 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 7f62e4040aeeadc90ecdf345d8442d839c9cddcb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 04 Oct 2013 03:25:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

commit 322ca2fc66d95320f975bbf3209a6f6dc2c14948
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 11:03:22 +0800
Tag:    v2.6.0-beta

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

commit c7387be83b99971576d487f2244309e6443b2aa4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 03 Oct 2013 03:34:39 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-16464' of https://github.com/timhunt/moodle

commit 18f04ab62520eb1dfa7743fd312361ee9772393e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 07:10:08 +0800
Tag:    v2.6.0-beta

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

commit 6579a7b7910e88f45df71da618b172ad36f1ba51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 06:36:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle

commit 55fcb3504f6203fa5fd214982be80636b16aa760
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:52:03 +0800
Tag:    v2.6.0-beta

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

commit 49b38d141e0db01cc189dfabffcf05fceb5f9dd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:36:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle

commit 28a6f665f4ef5e7caf7147b573018331bf8e2e23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 05:27:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle

commit 7f58018843213a81626e5b439da6b08dea4b1ccc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Oct 2013 03:14:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle

commit c78fdd8db3f4d6efc775603c38d4324d1f1753b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:50:53 +0800
Tag:    v2.6.0-beta

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

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 49c29a3f4643d900c40e9fb4341998b9d6ca7cb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:49:55 +0800
Tag:    v2.4.7

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

commit 421dd2e8ebe8eeea0aea430d8c8a06c1af34b346
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle

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 92fdea041d4e21370c235eb5eb33f84992e18216
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:35:27 +0800
Tag:    v2.4.7

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

commit 9b2fdfab44479dd05e8119abc60fb1bc0a933d50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 09:06:28 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle

commit 5101954f03e63ca6fc32856b3a16e3fd9d9f5da5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:58:17 +0800
Tag:    v2.6.0-beta

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

commit a0a63fa52625ffd99e6c98374bb7af0ada768bd0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:45:18 +0800
Tag:    v2.6.0-beta

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

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 a7fd94957177f879cdabb2784dc9c5c3f4bc676c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:44:44 +0800
Tag:    v2.4.7

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

commit 52dc898d167b6f2ed196b798c33d8bc0b4ff2d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 08:37:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges

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 53be2d782a038f085508d6c54d6a1278553d7883
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 07:07:22 +0800
Tag:    v2.6.0-beta

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

commit 5e319f510105796b9930437e8d78a502ec410cc2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:18:14 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle

commit 7da590c11b0e84b62b740ad763a72e2cb890e779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 06:05:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges

commit 7bd5d84fd89132d306aa96ea5106b348bc6dba5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:17:13 +0800
Tag:    v2.6.0-beta

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

commit bd5797e6cce3ac6b0406c046910b64d9c777c1ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 05:14:04 +0800
Tag:    v2.6.0-beta

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

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 c3923927255cdd37a4dfef2edf809d307f7e3b67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:54:26 +0800
Tag:    v2.6.0-beta

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

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 92416730d17e280773a0c9f0ee97b5e503cc7d65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Oct 2013 04:53:19 +0800
Tag:    v2.4.7

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

commit d55c29562bca937e66109a9795d4ffc7a533d875
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:34:51 +0800
Tag:    v2.6.0-beta

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

commit 73cc3bdeb0ea4146201506651f22f3d331dcf833
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 11:15:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

commit 4754755625e0c5e116cf9230a880ed9061f13ed7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 10:42:03 +0800
Tag:    v2.6.0-beta

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

commit 00a28794128f0f312251718d287ceb6105a7db78
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 07:09:50 +0800
Tag:    v2.6.0-beta

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

commit 28a2ecc6c469a8bceaff38951da978d5f0b05087
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 06:55:19 +0800
Tag:    v2.6.0-beta

Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle

commit e2c4c4202ddaf8938f00dc646d7e1e7d1da41625
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:48:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle

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 2f0a996b101b8d0e0cab1acbbd31e90f02abbfb5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Sep 2013 05:38:11 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle

commit 322d9c8cdafccbd5143ff6ac0abc3664d2e3815f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 27 Sep 2013 07:32:05 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

commit bc29e8f07a3fa38c44134b81ba74c2a86cc41af3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 26 Sep 2013 06:13:01 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle

commit e50df55c919aac76b503704687ac50bc79eeed7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 12:27:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges

commit 6eef32525ecaad13daf157b5c48785cbc2060dd1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:18:30 +0800
Tag:    v2.6.0-beta

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

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 77b4970559a685acd4fd3e2d4323afb64ffc8a2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:17:55 +0800
Tag:    v2.4.7

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

commit 35ed37be8f41977e5d3f5131c7a62f00098d6c15
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 06:02:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle

commit 548fbd8e1c906b48019fd97a472cc76aeb2c5c64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:59:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle

commit 4b005d875156eef8f783a0dddbd177f44e739407
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:49:29 +0800
Tag:    v2.6.0-beta

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

commit 1f6181e5aa656223d9aee94594cfc9db32389a23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:31:43 +0800
Tag:    v2.6.0-beta

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

commit a78e39e3d31b7acd9b54cb4bd39d6bd356424320
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Sep 2013 05:27:44 +0800
Tag:    v2.6.0-beta

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

commit 40643dcaad96e4c73b57c8c995ca87d208361c5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 17:16:29 +0800
Tag:    v2.6.0-beta

Merge branch 'int_behat' of https://github.com/skodak/moodle

commit 1f4f0901d0fc3a6569b4f4768b936ba3aa3dbd10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:14:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle

commit fb45f406a196f5e8fdf65d607300b60ffc940c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:09:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle

commit 0eee7f9b43e08c27ed5934854cdc935648328978
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 08:01:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle

commit 0fd451b7adcf8a7db9dc74af9699e1d1499afa92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 06:02:58 +0800
Tag:    v2.6.0-beta

Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

commit 96218d0edbdbe7c3b6578ac8a8d72afdaeb037a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:37:10 +0800
Tag:    v2.6.0-beta

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

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 b3af3bbb963bcf7e6e526251918022dd82f58826
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:14:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle

commit 339feb64205c212f1e4084b0b39ce9952cf5cc01
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 05:04:27 +0800
Tag:    v2.6.0-beta

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

commit c99fcebdedcd45925a500ac3291fc2b9728890ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:51:41 +0800
Tag:    v2.6.0-beta

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

commit cc6a0ec48f68ccd1c7f7e05c56a773a32bc00a68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:33:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle

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 fb092979bfae40b84d4927355abb06e13e89975e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:32:46 +0800
Tag:    v2.4.7

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

commit 83c875a9a05f7057aab29755be3cc2905ce726d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Sep 2013 04:28:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle

commit d99847a338a6813ed08ad14ecaa2cb95c4c858af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Sep 2013 11:02:49 +0800
Tag:    v2.6.0-beta

Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle

commit 0f00c5c59493f366fb844baed6d33bff06f47cf1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:56 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_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 2e79f57db9cb0d641789762c611a826e956574dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 20 Sep 2013 10:34:25 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 669755a423b73f6db285114332271207af05ce6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 19 Sep 2013 05:49:31 +0800
Tag:    v2.6.0-beta

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

commit d4d97627d2ffce96e86abc06e2d11d48dd07232d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 11:26:06 +0800
Tag:    v2.6.0-beta

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

commit 26c9c586c9a33520e136d4c09da9011ccad7f6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:30:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle

commit 23eed08e1a3e82732246b1d5aab50c97ec7fc24b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:02:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle

commit 81ece3f7aac155247ee99826160036240a35e94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 10:00:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle

commit c8f052dbdd14964d107103b588201f33bb5d6b29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 07:44:39 +0800
Tag:    v2.6.0-beta

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

commit 77365f7ff68f292860459184d1aebcbd6987e8d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 05:02:32 +0800
Tag:    v2.6.0-beta

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

commit f34af1167acb6696d188fb64a8b65336fd36a789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:59:08 +0800
Tag:    v2.6.0-beta

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

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 82b2bb5eca5bceb8e351265e5673fe774a80a1f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:50:38 +0800
Tag:    v2.6.0-beta

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

commit c2e7f9042761c65dd5a4e59b83e8fcb311eba0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:48:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41466_master' of git://github.com/kordan/moodle

commit 0dd46bb851f510ee32b45b1946fe5055711bfa17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:39:14 +0800
Tag:    v2.6.0-beta

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

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 1d5c18879822cc19549a484a7b88782da316c270
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Sep 2013 04:38:51 +0800
Tag:    v2.4.7

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

commit 31dea4fea43a4cb7c752c70c0372738614a69630
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 11:07:57 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle

commit da8cd86f173a7487b1e8d5f89cd48d3b799f34f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:56:05 +0800
Tag:    v2.6.0-beta

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

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 ac7cbc012e8eb00568332cc08f87df673811f2ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:54:52 +0800
Tag:    v2.4.7

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

commit efc2c5171280df1f463f40193d90bf18001d7927
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:51:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges

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 db220c29723fc509c22f2abf15450087dc44b307
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:48:48 +0800
Tag:    v2.6.0-beta

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

commit a93db2885006f5468fc43b7e87f561db5ad76664
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:46:07 +0800
Tag:    v2.6.0-beta

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

commit cf13da65e1c868eb8d1f65728fe5cde93db56958
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 09:13:41 +0800
Tag:    v2.6.0-beta

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

commit 0d5c80e2980715295f098765b16a4d0ae294c19e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:48:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41662_master' of https://github.com/totara/openbadges

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 9034f94d0748b00082ac33b870f3f73e5fc16f3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:42:47 +0800
Tag:    v2.6.0-beta

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

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 1081b8ec84d1579ad09488130d50e16bfa60a8c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:38:25 +0800
Tag:    v2.4.7

Merge branch 'm24_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit df1d3e911527eb797c61e5ad3a34d7c629e600fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:27:16 +0800
Tag:    v2.6.0-beta

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

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 af0a06b521b32ea21a540dbc222d265cb9ca0e4d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:26:50 +0800
Tag:    v2.4.7

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

commit 7c76607aaa21c5e5e7d8394b77162d2f2eec35c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:13:17 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29987' of https://github.com/bostelm/moodle

commit d7b20f165033dca1ca975e5983d967aee41fd857
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 06:12:51 +0800
Tag:    v2.4.7

Merge branch 'MDL-29987_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE

commit 694cb9b053ece1ff0c52a1e1b8f6d21f49fbe540
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Sep 2013 05:40:00 +0800
Tag:    v2.4.7

Merge branch 'MDL-41534-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 6b909c759d72a815167493d3fcf6ff1971b092e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:50:08 +0800
Tag:    v2.6.0-beta

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

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 214816fb191055681005a03b7a4a259d32fceebc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 06:13:29 +0800
Tag:    v2.6.0-beta

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

commit b3602b3e5e4e85e7fd77d45810ef0ea4752252f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:47:41 +0800
Tag:    v2.6.0-beta

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

commit 2ecaec9bb6e37c463cc36fdf452dde41dee3d70c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41658_master' of git://github.com/kordan/moodle

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 3b2c61fdb82c369cb65061903780276a02deb7b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:42:14 +0800
Tag:    v2.4.7

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

commit bf6181d451daab9a13ab620c9fa15be1c1d63582
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:39:13 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40262' of git://github.com/kordan/moodle

commit 67c52739d3dd10b2ec0ed8d22a2a2f1da2e34a0f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:32:33 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41634-url-download-warning' of https://github.com/mnoorenberghe/moodle

commit 087bc6ba67d1266631f58ab9be36df3d007459fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:28:42 +0800
Tag:    v2.6.0-beta

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

commit ba5d7f8b1cb522fdec316397204b346295fc86fd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle

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 c88b113c1ffae6bd11f8d270a7f2b6b148a175ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:26:02 +0800
Tag:    v2.4.7

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

commit f773cb2e9424bb5366e139e1404c8db99c8de62f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:53 +0800
Tag:    v2.6.0-beta

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

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 aa6699f4db37d2934c5c57a539138f4eb4b95fb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:20:27 +0800
Tag:    v2.4.7

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

commit cde5c4a58eb0016eb885f8886e3805c959ab9b38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:12:32 +0800
Tag:    v2.6.0-beta

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

commit 3623d74adc61ef6b0eb3f584f66ed35131fa44d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 05:00:54 +0800
Tag:    v2.6.0-beta

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

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 994009ddfecff888ffb6c1719348278e72e62859
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:54:26 +0800
Tag:    v2.6.0-beta

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

commit 33636b404001815735716b3b0ff41992e70d0969
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:52:52 +0800
Tag:    v2.6.0-beta

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

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 f605403fe22915558e54add6c8ce3b442bd0f865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:51:02 +0800
Tag:    v2.6.0-beta

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

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 79257da228e7fd77af29065a061a3b6a12689f93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:45:22 +0800
Tag:    v2.6.0-beta

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

commit c4f5f0ee597758530d58e00e3a65fc4973f7aca0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:42:37 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges

commit e0a8b60f5dc706afc42c23f239b38c3a451eafbf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:36:54 +0800
Tag:    v2.6.0-beta

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

commit c02045ddc4b8cd0ae3af6a7800971f84b64963c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Sep 2013 04:34:58 +0800
Tag:    v2.6.0-beta

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

commit c0382dd012d7c080a19a66c17b6e89182f8db8e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 11:44:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle

commit cb7ca00c55ee5be44063a0db5cdc45cd3607fcb9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:12:13 +0800
Tag:    v2.6.0-beta

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

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 b14d0e47131223bc0a16c526267a6db2f8469220
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:11:21 +0800
Tag:    v2.4.7

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

commit a63d1e2871541ce14c640d6bc3b03e205095c0d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 09:07:37 +0800
Tag:    v2.6.0-beta

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

commit a775f2c96dbb00bdb2e3fa2625fcb348f9b64bb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:22:04 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

commit bee0a508ef4d1ac41bcdc3d7cf0564244c8ae82e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 07:16:30 +0800
Tag:    v2.6.0-beta

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

commit 68d3e7682ad51765b8918e4b0eb96f3a83eb5d43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 06:31:59 +0800
Tag:    v2.6.0-beta

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

commit 12d50d8216f7b7797d5d49e1576b0c989acd715f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:46 +0800
Tag:    v2.6.0-beta

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

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 5db72d63c567eef6c28fdb233ccdac88929111f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:38:23 +0800
Tag:    v2.4.7

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

commit 9b6415dd38a6e6e4f74aa280cdcaea2be46b29f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:36:24 +0800
Tag:    v2.6.0-beta

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

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 d58d0239db1155d0bd588a4838db9ec972d18697
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Sep 2013 05:35:50 +0800
Tag:    v2.4.7

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

commit 33909ed001aa1891b7dd6046eda5beb4cfd75414
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:56 +0800
Tag:    v2.6.0-beta

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

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 eae5890112e2dc500ac86542abf79c3a9b26764f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 07:12:11 +0800
Tag:    v2.4.7

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

commit 771080ba7d113039be0b83af3adeb2d069db070f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:54:11 +0800
Tag:    v2.6.0-beta

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

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 fd9ecb595f620bdc19c099175e48f52a71b09e17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:50:56 +0800
Tag:    v2.4.7

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

commit 1fdc20cbdbebb1d49414dedd8f0954408546a0fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:49 +0800
Tag:    v2.4.7

Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_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 fb76f7492e59d02e1447c9c1698f46e88830165d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:48:13 +0800
Tag:    v2.6.0-beta

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

commit 58cc269d0c55c5cb6a80b60cd527986d735a094a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 06:19:00 +0800
Tag:    v2.6.0-beta

Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle

commit 0b7a2b7bec7fe778fc5d7895220c5ebc4102dbca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Sep 2013 04:58:44 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle

commit c1613ed53ad966510884d51043f2dee138d6e682
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 09:17:37 +0800
Tag:    v2.6.0-beta

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

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 2968602ccbf1eddb54107ee8152ea432d82912d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:13:34 +0800
Tag:    v2.6.0-beta

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

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 4bc9eec96f8ea0ecc51ab83d8a433ef12e36ad96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:12:43 +0800
Tag:    v2.4.6

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

commit 6eee89bc8f73ef59ba7b837fbdc3ebb2c51436f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 08:08:46 +0800
Tag:    v2.6.0-beta

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

commit 1ef7722cba32b19c903edbb45dc33aa6f1875c6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 07:01:51 +0800
Tag:    v2.6.0-beta

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

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 fef821d726a9cd18cd9fdba7b8386b2ee1edfc31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:59:34 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit b89fbc461555d1d7ec58249681e6280eac7baa72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:56:00 +0800
Tag:    v2.6.0-beta

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

commit ead9cce340cb90536b21f5e0388c67400ea602f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:48:02 +0800
Tag:    v2.6.0-beta

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

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 69127087c928d4c74f3cfaa19460201f94314f54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:33:30 +0800
Tag:    v2.4.6

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

commit cc76e82d5862224e9f2b8fbb42b889a5292e470e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:21:04 +0800
Tag:    v2.6.0-beta

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

commit 0eb65affd29ed17e05a2c5554893f420c5b97d4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 06:09:08 +0800
Tag:    v2.6.0-beta

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

commit c5bba2fc2df9b485e5b4e98fa97498700c9f59e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:59:19 +0800
Tag:    v2.6.0-beta

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

commit 93564564e471a658e3da1486a2fa78cad029595b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:56:16 +0800
Tag:    v2.6.0-beta

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

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 b43863f6a98fe55f04d9e8131590d5f9d73f0692
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Aug 2013 05:29:31 +0800
Tag:    v2.4.6

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

commit d333a3f2da666042e7dd8eeca41145e5e915cc1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 15 Aug 2013 11:16:19 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41200' of https://github.com/rwijaya/moodle

commit 0b7e4a1474f30651f88f4623e52c6d551077c3ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 14 Aug 2013 05:15:00 +0800
Tag:    v2.6.0-beta

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

commit 969de2a200e7c162508209b097f78b46fbe5789c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 10:13:13 +0800
Tag:    v2.6.0-beta

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

commit c0dfd035c4b0f6c563a55b5fcc0b4f49fd67712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:49:12 +0800
Tag:    v2.6.0-beta

Merge branch 'wip_MDL-40077' of https://github.com/jamiepratt/moodle

commit 0c0efd71a1bc2c889a039468dd42cbd637dc7cb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:26:26 +0800
Tag:    v2.6.0-beta

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

commit 615cf2d15a287c79ba5ff5b868de4d37b4a1f8a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:34 +0800
Tag:    v2.6.0-beta

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

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 c7f4deecbda86ae6d2e6ff210f67f005dd131cff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:19:05 +0800
Tag:    v2.4.6

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

commit 49c7794dcf9866d543c2b6bc09d9cf28e26e53a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 06:16:14 +0800
Tag:    v2.6.0-beta

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

commit 717d68544d4291d40a8de807d346d284f334974d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:46:17 +0800
Tag:    v2.6.0-beta

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

commit acf6a06d5ed1c7e375b35356b077b85f8028badd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:45:03 +0800
Tag:    v2.6.0-beta

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

commit 0ade13532ba91fcebd187c460221a82d70af00e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:41:27 +0800
Tag:    v2.6.0-beta

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

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 0047905f9148d745cc2a0e8344cbcaf00373c169
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:40:59 +0800
Tag:    v2.4.6

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

commit defb89c30c8f25e26a39ea7789aaf01cf8f7b562
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:40 +0800
Tag:    v2.6.0-beta

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

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 452ff2528432a38dea3c2f994d6531cd526ea347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:38:20 +0800
Tag:    v2.4.6

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

commit 90fb4f39fd530e997488152449483834dbae2225
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:37:02 +0800
Tag:    v2.6.0-beta

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

commit 6648f17384969436349d78d7ae291c0072568e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:32:48 +0800
Tag:    v2.6.0-beta

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

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 bbf434b6396a1dcff1181725a5945c52e8061a5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:27:50 +0800
Tag:    v2.6.0-beta

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

commit 23b7f1dfcfb29ac85c4bf6249cd3dbe43ca3384b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:24:12 +0800
Tag:    v2.6.0-beta

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

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 3155dcf5414d2eb103f1862611e7432f2cc1383c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:21:40 +0800
Tag:    v2.4.6

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

commit 61f2c458d59080bbac44671f59f6daf0244a1b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:12:24 +0800
Tag:    v2.6.0-beta

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

commit 41b0597855de58bfa4932469b7d520beb0d2e60f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:10:28 +0800
Tag:    v2.6.0-beta

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

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 761b48df5912e479151ad3530bb4dace822d1daa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:08:15 +0800
Tag:    v2.6.0-beta

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

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 06737a22ea5fc31947e4348c8995b4c5619a8718
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:07:49 +0800
Tag:    v2.4.6

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

commit cd0103fa6043983ee9084a223903411e15615224
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 05:03:45 +0800
Tag:    v2.6.0-beta

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

commit f37d53296df4b5f7dd764ae1a8c188a2198ba089
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:57:15 +0800
Tag:    v2.6.0-beta

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

commit 1e6ac6957e920fcdcc5dc07d5402e33be4a4e79a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-30895-master' of https://github.com/mouneyrac/moodle

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 c5dd64f1e9d82b175b10832219cc0cdf5472957e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:45:13 +0800
Tag:    v2.4.6

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

commit 8fa5ad621224573063afb8418f6ea9a95bb6b629
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:38:33 +0800
Tag:    v2.6.0-beta

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

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 c41a6dfcd35b020e58f305fa2213404c4e25e091
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:37:59 +0800
Tag:    v2.4.6

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

commit 97907a85f103d2cbf9775906d93cc445da011d49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:36:01 +0800
Tag:    v2.6.0-beta

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

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 869a5896d05d127b9524cd0aa952e6ea4afaef9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:35:23 +0800
Tag:    v2.4.6

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

commit 8e9709f8bfb4bd62f52ff6eaee67015b679268bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:33:12 +0800
Tag:    v2.6.0-beta

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

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 f568a40ac733d972508c37a789d3d28b99b88720
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 13 Aug 2013 04:31:59 +0800
Tag:    v2.4.6

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

commit d3fb29877edd41c35703958d845382043964f5f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:23:10 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle

commit 63106eae7fa30cc80512b269c663b44b82f65886
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 10:03:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle

commit 8b7378cff02d6a9717f54bb57691db8cb2e957ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 08:11:07 +0800
Tag:    v2.6.0-beta

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

commit 61bec33f53704994cb750d65ba48ebf0bc381418
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 07:02:48 +0800
Tag:    v2.6.0-beta

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

commit 45f133884e7297a61dd6a1ac2ac920f11033951a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 12 Aug 2013 06:38:06 +0800
Tag:    v2.6.0-beta

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

commit 9ce818b6d712bb46cc653acd96bec9dc2a90e9a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:55 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit a6e4a83d9977edd5de01490cda05c17f8134c3f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:42 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_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 ec94685c4d5392564cb3be0f4aceaf54be75fd48
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Aug 2013 12:19:12 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit f05ea82cdc82baf85f1b6d99556a167aa0da32aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 11:19:49 +0800
Tag:    v2.6.0-beta

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

commit d4519366f4dd66400dc524acaa1df32670c2611e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 10:01:51 +0800
Tag:    v2.6.0-beta

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

commit 823c0c80e9f35843fffc72593b5ab7ac3f724915
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:39:40 +0800
Tag:    v2.6.0-beta

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

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 b6a2a20236c3da0705b5abb284a63a05fc274856
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:36:55 +0800
Tag:    v2.4.6

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

commit 774b1089a583ab0cfb1a42f021b9c18b28f4bf65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 07 Aug 2013 06:23:32 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle

commit 36671670e117ee487d7c19fb545bb06acd4c9878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:30 +0800
Tag:    v2.6.0-beta

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

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 b19a900a9b08840ce303a611909308208b7b4be1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:51:06 +0800
Tag:    v2.4.6

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

commit d2132f02e2adfd67a0d2efd617fff1d3c0e0fab9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:45:16 +0800
Tag:    v2.6.0-beta

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

commit 9c83b82b1b95a1aa943a2a164e2a381ca8a8af26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:39:41 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle

commit 2ad4a763ab052e6fcef19eaa7814e2f1a63d1aa8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:36:33 +0800
Tag:    v2.6.0-beta

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

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 206f18c836b95006802b88cd5bb27b5bb453c365
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 13:31:14 +0800
Tag:    v2.6.0-beta

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

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 5261f26e0e61be1bfb267f1405603205d15016ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 12:55:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle

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 1d92024f99f999d98932c26239b49494706c021e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:50:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle

commit 17440b21980643f4a4be3f4fae3f667ec1fa42a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 11:38:18 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle

commit 68736bd623f3586286792e641d37e0a07350efb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:47:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle

commit c3aefeb5a6a1667b4c7ed7383e7312c7c39855ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:49 +0800
Tag:    v2.6.0-beta

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

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 504dc600482e21e021226e507b07513038d231b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:39:15 +0800
Tag:    v2.4.6

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

commit e145762b172995bfe61099d4f32e29ec0e7b4723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 10:37:43 +0800
Tag:    v2.6.0-beta

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

commit 471dd4ff67427f094cb88aa45839c077868bc3f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 09:59:23 +0800
Tag:    v2.6.0-beta

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

commit fe33106bb1f7c23d58f4bfda1519264747d88133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:49:28 +0800
Tag:    v2.6.0-beta

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

commit 468ee9863d8e61129b891907199d5c1c733aae28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 08:45:20 +0800
Tag:    v2.6.0-beta

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

commit c7c020aad2836f6d2e99a3da41fff5a067babbf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:23:45 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle

commit 911b271215f916690889cdd2d119958b15bef8f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:11:20 +0800
Tag:    v2.6.0-beta

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

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 ecd106d68dc35912f859c08f9adcb04b79b76638
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 06:08:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-27953_m24' of https://github.com/markn86/moodle into MOODLE_24_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 1498e8548315cdc5ce0fda6dec2404aa8b9e9906
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 05:54:48 +0800
Tag:    v2.4.6

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

commit b09abb05abd87b78c2361bb797a6026cfaba74a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:53:24 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

commit 1eebbc28543823b9818e8c4fecafb431b3fad44f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Aug 2013 04:49:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle

commit 6aed99dd0a5298edb37b43b81eebc3e1f201e3b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:46:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle

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 2c5c56e974a1de3564b729c2b065df80ccb3dd1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:37:37 +0800
Tag:    v2.6.0-beta

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

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 176a60227d0fc9831663c76165e0a62b919e64da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:33:09 +0800
Tag:    v2.6.0-beta

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

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 86ebf30fcf38cdca2987d1f5e607bec84f84be13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 11:31:59 +0800
Tag:    v2.4.6

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

commit 4c7f0562d07c6d81ec28cf0aacd5cfd8392ddbde
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:47 +0800
Tag:    v2.6.0-beta

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

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 9d146cf08a6f0b5c6e3296b6a04c932c1f263297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:38:31 +0800
Tag:    v2.4.6

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

commit 2b80bb33dfa3d309f3f0df6c226760eeefa9f86c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:15:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle

commit 335fcfa4f91432616a884decaac9f779b6d460d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 10:06:26 +0800
Tag:    v2.6.0-beta

Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle

commit 324b489bdba84f35586ae8c908301a6857ead99f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Aug 2013 09:36:56 +0800
Tag:    v2.6.0-beta

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

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 0460f175d23ba88cd667e4817118b4da1fead10f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:13 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 8dbc9cf753d4ac7df120feaba788ad3f862fa848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:12:00 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit b3db9ddaf88eb06fed12475294ea9ccdcab09246
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 02 Aug 2013 04:11:35 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 4a4d57ae1fa5cd974b78fc8ad27a99bae9d6dc81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 01 Aug 2013 05:47:57 +0800
Tag:    v2.6.0-beta

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

commit 6867a78d7513076ed5bdb061b6544882f8baa519
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Jul 2013 05:11:22 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39430_m26_opcache' of https://github.com/skodak/moodle

commit 56c3e4762f555c11b6ec172742e85d0e6415e60d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:36:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40902_master' of https://github.com/nadavkav/moodle

commit c6457b8acf686ea20ac9b8462d6abdbf744e2556
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:21:38 +0800
Tag:    v2.6.0-beta

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

commit 4960ca0738b7b75301312b6f7a58c217438a7a90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 06:19:41 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39915_m26_tests' of https://github.com/skodak/moodle

commit a2d847842e244da15582fe04ce2d67278f5ed3ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:40:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40746_master' of git://github.com/grabs/moodle

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 816f873068b6ca7851942ef814f1d2c2ff842465
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:39:03 +0800
Tag:    v2.6.0-beta

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

commit 867eba7641069d0aa9f6bd509e16f910ff0cc6ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 05:33:56 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-39786_m26_metarole' of https://github.com/skodak/moodle

commit 6cef3dfe8eabb257034bea8d27b416c383a2dc3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:59:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges

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 0d33dbd9b87a77d397c6e5c53e4a4319a552e4e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:58:14 +0800
Tag:    v2.6.0-beta

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

commit 73b4c1da844fcff99c8c21a54a8d05b0dc95d82d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:55:35 +0800
Tag:    v2.6.0-beta

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

commit fb947a424a86384795709ff2dc93f9f0c6b34723
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Jul 2013 04:47:34 +0800
Tag:    v2.6.0-beta

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

commit 84522488819a4eacbc15612fa9db1c897ca649c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 09:05:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-11270_m26_nvarcharmax' of https://github.com/skodak/moodle

commit 1091c534450a83862485aab8d2968f7bd5e2e310
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:31 +0800
Tag:    v2.6.0-beta

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

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 683fbbb8d705e6df77d61d5c90d39ccc236ff39b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 08:54:07 +0800
Tag:    v2.4.6

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

commit 609bda269ed2e3d3b79526d65015c47e47b3e9b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:53:02 +0800
Tag:    v2.6.0-beta

Merge branch 'w31_MDL-40891_m26_mkdirrace' of https://github.com/skodak/moodle

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 682f6d57cd1b25087f2dc772a6ee2e46bd54ced2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:52:14 +0800
Tag:    v2.4.6

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

commit fa198e6346bdf9174524f3350b9e6e9eb01be5a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:50:00 +0800
Tag:    v2.6.0-beta

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

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 dacf5b62e8a8b4f41b5589e6871bcbbe7b23d2a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:48:15 +0800
Tag:    v2.4.6

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

commit db5ee815762a9abf3caf6c75457608730dc3be7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:57 +0800
Tag:    v2.6.0-beta

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

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 aa713f26bdbf763aa688aa5a6b7f7c032448ff67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 07:01:33 +0800
Tag:    v2.4.6

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

commit cfafbd1270c0f21b1e9622a377250a902cacc15d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:53:05 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle

commit 6269efd29b84d6c54c2f08140f17e50d3c464b96
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Jul 2013 06:49:40 +0800
Tag:    v2.6.0-beta

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

commit feb34ff4e87ffb342e435ea9aeaa6aff7d5cea7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 15:19:47 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle

commit 904c38b31deb41ff22a923f54d999d455395d5a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:28:26 +0800
Tag:    v2.6.0-beta

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

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 d853f819dcb014c803f567ab1928517cba395954
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 24 Jul 2013 07:14:14 +0800
Tag:    v2.6.0-beta

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

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 deeae9c1553e62d227c9fd1dd3b0776ce405de82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:14:27 +0800
Tag:    v2.6.0-beta

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

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 1f3be767084950a8e92f2d8afd85fb268997085c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:12:35 +0800
Tag:    v2.4.6

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

commit 18474f822b196e9e5af1b924a5253293897f41b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 10:09:08 +0800
Tag:    v2.6.0-beta

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

commit 97ff2341b37cd57f16a716c2bd50221c0354e03c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 09:59:16 +0800
Tag:    v2.6.0-beta

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

commit 07724a9ceee993bbcc805b65990d74e0d70bd9c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 08:00:59 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39695_master' of git://github.com/kordan/moodle

commit 031ef3f871e452bdbfc3ece5fb2c67a522aae92d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:57:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40670-master' of git://github.com/barbararamiro/moodle

commit 092a99ef08c4d2920e030b80338c481a3aae56d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:39 +0800
Tag:    v2.6.0-beta

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

commit d0ed9d6375812548a7f0d6500e8bd43b6dd3258b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:12:34 +0800
Tag:    v2.6.0-beta

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

commit 374f7b1d287d6edc0487066f2ad02269987a1eca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:07:53 +0800
Tag:    v2.6.0-beta

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

commit 0ad4bcd102d8311738c344615c1425f2de9e8052
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 23 Jul 2013 07:06:08 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

commit 6426d2d26433dfb83d12629deb7644beacc9bb39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 08:19:05 +0800
Tag:    v2.6.0-beta

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

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 93b4d2658a97d2a74d857bf08802dbd8c7e33c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:07:00 +0800
Tag:    v2.6.0-beta

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

commit 1be1f6be53d9e877b92a97dd52dd64519f0da728
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:02:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle

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 286232d695871f266afe019b494452c7045090ad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 07:01:48 +0800
Tag:    v2.4.6

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

commit ccae3a612d2c2b2ac396e8e7ef9b293698c4e7b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:43:28 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle

commit 4e6ad78679bcc70bf88f1ad3cc238fc6c0fe7e10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:35:18 +0800
Tag:    v2.6.0-beta

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

commit a8402cc115c6dbdae78612eba50130f3ed10f46f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:31:39 +0800
Tag:    v2.6.0-beta

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

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 97d98e9920ad387c23e4d3bc6285045797bf5d42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:30:29 +0800
Tag:    v2.4.6

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

commit a4fd82ac754b0939da0cadbabe371fa86287746a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:19:13 +0800
Tag:    v2.6.0-beta

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

commit 33ed6a9d94260bb4836ec4367a16f145ab26b611
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:12:44 +0800
Tag:    v2.6.0-beta

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

commit 05fb99ac705c0a0a4155417fd914d6b98470e604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:10:11 +0800
Tag:    v2.6.0-beta

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

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 3b0c725de11d8758d8bc3ec920fdefe559a4fd24
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 06:09:49 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-40512' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit fc7e5a031edd32fa8a0d44d898da568d54a5e2e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:54:38 +0800
Tag:    v2.6.0-beta

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

commit 59cd82f9b7597706d7988de68b7ec61142bb965c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 10 Jul 2013 05:51:15 +0800
Tag:    v2.6.0-beta

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

commit a13ee8e18a139ffdd44bdc482777125ae2f53a62
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 09 Jul 2013 10:42:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle

commit 93b2977d9d9cf103218c5f0afde705911aa3a2ce
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Jul 2013 06:31:48 +0800
Tag:    v2.6.0-beta

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

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 6ee9989d259ebb0272853c963631d53830527843
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:48:05 +0800
Tag:    v2.6.0-beta

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

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 e962fe0871715aff48a1b4a11e3ca390755a0d6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:22:27 +0800
Tag:    v2.6.0-beta

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

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 88abda50aabcc798a0fdaf00e2b6ba8388c6807f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 01 Jul 2013 09:08:31 +0800
Tag:    v2.6.0-beta

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

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 4eba7399ad6bbfd78aa024859d29d12b4b16efc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 08:19:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40305_m26_phpunitloader' of https://github.com/skodak/moodle

commit 49eef7d82d7366c180903ab2a95fb8f3511a7527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 07:35:57 +0800
Tag:    v2.6.0-beta

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

commit a1d472d8c60afc8932b4c2099038a10ee0393831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 06:59:29 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40304_master' of git://github.com/kordan/moodle

commit 10a741cc64cc9778d4e7dc18508c2f77446dfc5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:59:24 +0800
Tag:    v2.6.0-beta

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

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 cbc4b33afdb3f5910a2445c06e72f7d3df81448d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Jun 2013 05:13:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40289_m26_badgescaps' of git://github.com/skodak/moodle

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 c7b6c86a49a3a01424362e435bc1df256518be7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:43:19 +0800
Tag:    v2.6.0-beta

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

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 109a2ff00e5c2c55854d4ba430a387759c368e93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 11:15:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle

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 4ba45e3955ffc0479f8365df076c64a2d87b0d47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:43:00 +0800
Tag:    v2.6.0-beta

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

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 7bb2a9586e87395bb56a9fdf2198631d960240ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:30:49 +0800
Tag:    v2.6.0-beta

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

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 211c4734522822f52089d210462d1fa594360b37
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:29:21 +0800
Tag:    v2.4.5

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

commit 410899e3b237fe9be55cfcdb878e5cb3cc9875e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:25:54 +0800
Tag:    v2.3.8

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

commit 615a5aa6f1a766c7223f0d0a9e1a2c80342df66e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:19:20 +0800
Tag:    v2.6.0-beta

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

commit 9505fcffe49a1d22d9cb6d7c851bb79e818b4ae8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 10:08:47 +0800
Tag:    v2.4.5

Merge branch 'MDL-39280-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit f8dcecfd07e792b1cfe9ace617ea71f15a51f61b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:44:20 +0800
Tag:    v2.6.0-beta

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

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 1d713c7c53f1e73b3a45edfafc04f385dd6733b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:42:29 +0800
Tag:    v2.6.0-beta

Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle

commit 2d9161791f7787b2180fdb8169a355d997ed0a36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:22:30 +0800
Tag:    v2.6.0-beta

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

commit 9cf6081027b21f8f60cbb012df42fa4015eb1bd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:21:54 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-38347-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit a2e47d596a9f4624e2e83ba368567984752b040d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 07:20:27 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-38347-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 8448a12a33877a0b1fcd270ceba41617709c76f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:30:19 +0800
Tag:    v2.6.0-beta

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

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 6d4fe99033fae3ec5b064992710d1be4cbefdaf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:29:06 +0800
Tag:    v2.4.5

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

commit c209e592067965efdd4cd4b60fc4b286ce6edfcd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:28:46 +0800
Tag:    v2.3.8

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

commit 0b20ce2841d7b718c512171cc8afae4427467331
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 06:00:20 +0800
Tag:    v2.6.0-beta

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

commit ef03bb6d9fdeacb5d105b30fef2c11be743c1815
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Jun 2013 04:57:44 +0800
Tag:    v2.6.0-beta

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

commit 11fb83fee808e5e437dbbbb95f76a7187e95f374
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 10:06:41 +0800
Tag:    v2.6.0-beta

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

commit 9d109ad60df4deb1099150a43c83e95e67587cc1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 19 Jun 2013 05:13:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle

commit ef6650f703a5625d95f42445af9a5fb50d2d88d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:35:37 +0800
Tag:    v2.6.0-beta

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

commit 07cfd5e599140c8e7063441188700f572c8be03e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 11:34:30 +0800
Tag:    v2.6.0-beta

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

commit 36096f0fe921bc50114d1b1321dc022b4326a1d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:51:06 +0800
Tag:    v2.6.0-beta

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

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 0f8d5064f1ac1a783f653cbebb4e4ead5cff9634
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:47:25 +0800
Tag:    v2.6.0-beta

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

commit 5c8cfccad347d57fd99886b1ae96fb5c47aeedab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:29:08 +0800
Tag:    v2.6.0-beta

Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle

commit 1b194c904762d067f81361ed48b5aaa714153a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:06:33 +0800
Tag:    v2.6.0-beta

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

commit ad3d3c2ba7eb02a00c0fb88695c114d930c4830c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 10:01:54 +0800
Tag:    v2.6.0-beta

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

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 23f186b5c8224551b591c4a13fbc57c1d0f1092a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:58:48 +0800
Tag:    v2.4.5

Merge branch 'MDL-40036-24' of git://github.com/FMCorz/moodle into MOODLE_24_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 044bb690f8269196a4e31b8f9bfb22db0c2dc284
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 09:54:39 +0800
Tag:    v2.6.0-beta

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

commit d35d8311909a716b1f2b346b4787078e7cd03bef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:38:05 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle

commit 407020ef8c096dacd2b7f67c6e04d6c9feab9ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:26:23 +0800
Tag:    v2.6.0-beta

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

commit 7d7a6e3c20a2daeef19f0cf17e39d52d63105c31
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:22:40 +0800
Tag:    v2.6.0-beta

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

commit 21467b44613422dfb9070f38030df33b327e09f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:35 +0800
Tag:    v2.6.0-beta

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

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 46c30b7e1bce11f211f8f41884d5ea495b729f3b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:19:22 +0800
Tag:    v2.4.5

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

commit 540a8f8499e0cf9160d75cb0abbb120b743b6e99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:08:45 +0800
Tag:    v2.6.0-beta

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

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 c8802b6e6c5d5705f63a4fc2133af5053020ca76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:07:48 +0800
Tag:    v2.4.5

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

commit e667bd9db0299a4c511af178af0aaf6841beade7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 07:03:21 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle

commit 007b5f5f35063a1554ac587d63efd785ae9a976d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:27:11 +0800
Tag:    v2.6.0-beta

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

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 5008f4fffd6c8d7da6717e7e8167dc95742bae4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:27 +0800
Tag:    v2.4.5

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

commit 62c4ccef0e025a71d497341de0af9448bd51aa43
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:26:10 +0800
Tag:    v2.3.8

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

commit 03d34e07c0390bdacfe4aaa5b7655e29cd8356d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 06:04:18 +0800
Tag:    v2.6.0-beta

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

commit 7b8783b751822e0277e9edab8dd086271a3be809
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 05:04:27 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40159-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit df86b97f1ad4c0feb9a4457581b0035c7d71c89b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Jun 2013 05:03:54 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-40159-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 68e33c29321a4ea3c3cd435010893523b119ccbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:14:00 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle

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 c4eab12234cfd693fcac9e267b6d9ae5064da639
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:09:52 +0800
Tag:    v2.4.5

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

commit 4dac72bcc8d8f9db46c908213b64a5d209666767
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 12:09:36 +0800
Tag:    v2.3.8

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

commit ca64174031bef45e8231745f60f08cf121154cba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:56 +0800
Tag:    v2.6.0-beta

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

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 57efe7bdbab7ec54237266cd771aaaef7bf7eebc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:45:16 +0800
Tag:    v2.4.5

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

commit 0b79440ddfdd75a24900e28879b1fc97053af494
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:44:58 +0800
Tag:    v2.3.8

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

commit e4ce39c99fb8a68be2d53c7f5bd7fa661bc5633f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:31 +0800
Tag:    v2.6.0-beta

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

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 11270c4b2dac960ca2f6c6b55b1d15c2542e6be5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:43:07 +0800
Tag:    v2.4.5

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

commit a971dd39929c09e0a344383bef27f6566ccfc822
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:42:55 +0800
Tag:    v2.3.8

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

commit d63082454b6850c5cabec3b1bcd7939041a98a70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 11:10:41 +0800
Tag:    v2.6.0-beta

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

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 e41ecc6260146fe3595e20db1d1ae39479454950
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:30:24 +0800
Tag:    v2.6.0-beta

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

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 79cb5006f972204de97c9d2506e163f6daf685b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:26:13 +0800
Tag:    v2.4.5

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

commit 1691794cb1ee30fa0ec396ab2083c83564f889a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 10:24:37 +0800
Tag:    v2.3.8

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

commit 7d1d4137cac75313f7f32bcf31457edddeed6260
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Jun 2013 06:01:10 +0800
Tag:    v2.6.0-beta

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

commit 44df0d9aaa8e4905af73a24c28bdcd566461ea4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 07:36:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle

commit e1e6c0dd4ca35b64de568ce6d0d865147863a653
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:21:45 +0800
Tag:    v2.6.0-beta

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

commit aae402010b49e51bd6844d9de45eaa8637fe6d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 06:14:14 +0800
Tag:    v2.6.0-beta

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

commit ac547b717af2727b5fc46a74efea47ef2c359f0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:48:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle

commit ee4e6c04e20f4dbd68635a85cb9b1df497192dc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:38:38 +0800
Tag:    v2.6.0-beta

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

commit 5d24aff39fbbc5a3ed7a5bb194e63bca6afd1d80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:34:06 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

commit 18a1f186db87adff8589a4e387ccc0b1341b396f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:08:55 +0800
Tag:    v2.6.0-beta

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

commit cc5468de0e5fca96790fcb72c1377dc092405c27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:07:01 +0800
Tag:    v2.6.0-beta

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

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 7b50002304418f46c36ea0c2cf642a7c57e44c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:04:22 +0800
Tag:    v2.6.0-beta

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

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 0ad16081a2f207d21844a2755fc62c3636900c6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:02:27 +0800
Tag:    v2.4.5

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

commit 9439d0506c59cd3cb7db2dd4099c6cec302c96c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:24 +0800
Tag:    v2.6.0-beta

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

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 8fd47854a6685a9b6eef827b5f4c38084c84493c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 05:00:01 +0800
Tag:    v2.4.5

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

commit 1d26199125ad170fa781cda49ded1470ae398073
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:59:32 +0800
Tag:    v2.3.8

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

commit 9ce7b61e62eef0f4d739477bf4d8328d44eaf467
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:54:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle

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 ec18f333bdebda9f21a8c8d5382f15311d206526
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:51:59 +0800
Tag:    v2.6.0-beta

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

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 754fa1091627ecb6285c984daabf878bc52a87ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Jun 2013 04:48:00 +0800
Tag:    v2.6.0-beta

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

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 30db96bd90b6b5aa5ede5de390479d446d0c98d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:36:18 +0800
Tag:    v2.6.0-beta

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

commit 11ea436f4fe598e746f1e198e36d1600a85504f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:51 +0800
Tag:    v2.6.0-beta

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

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 ffb486a996aa8db3166533f75a559191cff29159
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:31:24 +0800
Tag:    v2.4.5

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

commit 3a2ad025e1e93a3a3867fa497b7e4df686636fc9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:30:58 +0800
Tag:    v2.3.8

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

commit 2a31efea1b69e6cfd8851a9d73cb8700c222afb3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:16:15 +0800
Tag:    v2.4.5

Merge branch 'MDL-39505-migrate-file-backport_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit f3358600e77540af03defd99023a3466add89f84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:15:47 +0800
Tag:    v2.3.8

Merge branch 'MDL-39505-migrate-file-backport_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 3343cd5d92f759c39ef5b38be819055c4b5d551c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:08:21 +0800
Tag:    v2.3.8

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

commit c1dfb624bf3043d294bb188a64d9554803d11b90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:33 +0800
Tag:    v2.4.5

Merge branch 'MDL-22390_24' of git://github.com/timhunt/moodle into MOODLE_24_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 2b46a31a3f57c1dae0c01f5f8cc577c012aae3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 13:07:14 +0800
Tag:    v2.6.0-beta

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

commit ae82c2858895baa9a0d41c3a6d07d7e78e616a46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 10:16:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle

commit b9565a00709ba572486017e0beec88096b124c14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 09:32:36 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle

commit 10c98b64e6b755fdff2d1e0b11d496543e8b105f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 08:26:55 +0800
Tag:    v2.6.0-beta

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

commit b26a15ff67cf738be8aee56341b71c1d9c4db8a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 08:26:42 +0800
Tag:    v2.4.5

Merge branch 'MDL-39454-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 5d37fd271d588145c14acbe1e24cf26148cdd1b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 07:06:17 +0800
Tag:    v2.6.0-beta

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

commit 9052fc4489844e0e8d17f6c684b984a88fd8fcd4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:35:10 +0800
Tag:    v2.6.0-beta

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

commit 2afd7d0277477f35c170b71df758ab96bd364ba6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:31:55 +0800
Tag:    v2.6.0-beta

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

commit bd7004d51c1e96dacfa6043941d70bb136ed86cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Jun 2013 06:29:11 +0800
Tag:    v2.6.0-beta

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

commit 8affd1ca7e433402221cc8d75149a33a2a8220b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:55:14 +0800
Tag:    v2.6.0-beta

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

commit 4fe8c2c7994daa418de4152bb4643fef516b625a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:54:52 +0800
Tag:    v2.4.5

Merge branch 'MDL-40009_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 94be2b507433af032128bb982d63c5fe0eca548f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:54:34 +0800
Tag:    v2.3.8

Merge branch 'MDL-40009_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit b8904b6ad5e56decba9d2b1322858870813485a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:49:04 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle

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 5dbb8b3909bf7bfda6a1c94e4b6a59c5a0f18347
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:47:49 +0800
Tag:    v2.4.5

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

commit 628e0528e846563440512b7a9d0fc1d7dc36b703
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:47:38 +0800
Tag:    v2.3.8

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

commit 56ad6d46d103d173ed5f2a749a0b62cad208bd47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:43 +0800
Tag:    v2.6.0-beta

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

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 e7b6fc35bfb2d9ed052642e1965d7546a52f7170
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 11:09:28 +0800
Tag:    v2.4.5

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

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

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

commit 018fc94211b5b8b85cae1615d7e342a53b4efd07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:48:21 +0800
Tag:    v2.6.0-beta

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

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 bf0cdbcf8ae0a1a44a0dc2d6908dc081138747d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:41:21 +0800
Tag:    v2.6.0-beta

Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle

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 1db4d513a794a7ce1ad8b9decb7d12313478a687
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:40:53 +0800
Tag:    v2.4.5

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

commit f83cd734f972997187687978e97368e2cbbc5887
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:39:54 +0800
Tag:    v2.3.8

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

commit 111f5291f9437bb7a0f9f9beb24d2453fce6b48d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 10:26:04 +0800
Tag:    v2.6.0-beta

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

commit fb8010732e2800655ca814b0f8ad1a19ec6933b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:31:03 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle

commit 4964633e3a39df732c7bf8214db6ef49a0a8d7e7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:30:46 +0800
Tag:    v2.4.5

Merge branch 'MDL-36090_log2_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit ad6976aae575a8c05d21edd78da96c3ce3e0aad0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:30:24 +0800
Tag:    v2.3.8

Merge branch 'MDL-36090_log2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 2c0fb4c788446ffb3abab42f24b23167830d5faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 08:14:17 +0800
Tag:    v2.6.0-beta

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

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 e559265c10265759569fe1d90510a1ebd58d234f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:43:31 +0800
Tag:    v2.6.0-beta

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

commit a6d966885bbccb608b5f8ad58e224dc2e4f5bdd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Jun 2013 07:35:26 +0800
Tag:    v2.6.0-beta

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

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 e09afa518415463d452a0bea399a7f571805cde0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:40:59 +0800
Tag:    v2.4.4

Merge branch 'MDL-39602-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit a32772051f4823ebe458662e3c01201efeef3c5e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:30:52 +0800
Tag:    v2.4.4

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

commit a2d06016f4e64f959d4f5d5fe5d2f9cae06a8f68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 10 May 2013 12:30:29 +0800
Tag:    v2.3.7

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

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 be9d851c07b8637e42e704d241bd7260b4f47e35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:14:28 +0800
Tag:    v2.4.4

Merge branch 'MDL-39422-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit b6bfe3b35cd3787d4cdab90f996571c972ecc099
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:14:12 +0800
Tag:    v2.3.7

Merge branch 'MDL-39422-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 eecd7b4412993ff0afcece10bc65c6d44eeccedc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:04:50 +0800
Tag:    v2.4.4

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

commit 55d212631028343abb9c528788afcb6d8e3bd62e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:04:33 +0800
Tag:    v2.3.7

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

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 609d262c176b5a12672e347b072679ee1ed14a50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:02:05 +0800
Tag:    v2.4.4

Merge branch 'MDL-39414-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 8617a082bbe219b0fbcb6f9d1da61364b06e4753
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 07:01:54 +0800
Tag:    v2.3.7

Merge branch 'MDL-39414-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 858131c09c03dccf5a92b24a842e4ea6edff06d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:14:09 +0800
Tag:    v2.4.4

Merge branch 'MDL-36060-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit c1163a13feca1631e121998cef1750f6c93503ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 May 2013 06:13:51 +0800
Tag:    v2.3.7

Merge branch 'MDL-36060-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 503630ed47dd15e7951681ce0fdea60728ebd61f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:11:46 +0800
Tag:    v2.3.7

Merge branch 'w17_MDL-39344_m23_lists' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 7de740be35c594b5d1e052b02b0fa3f2ac466c02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 06:00:09 +0800
Tag:    v2.4.4

Merge branch 'MDL-39303_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit de0917ef7fa4f677dff18cc47c4ff87c9c97bc02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:59:32 +0800
Tag:    v2.3.7

Merge branch 'MDL-39303_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 7e1c6bf8b46242997e48c882a7ab27b34230da93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:36 +0800
Tag:    v2.4.4

Merge branch 'MDL-39365-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit b7485643987573beb72a28edf6b93445870e6800
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:36:25 +0800
Tag:    v2.3.7

Merge branch 'MDL-39365-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 38fdbcf0014aac7c6b0ccab936b56ecf7484ce07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:42 +0800
Tag:    v2.4.4

Merge branch 'MDL-39398-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit d0fc4cf5394868c3aad35648145eb5f585342930
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Apr 2013 05:31:31 +0800
Tag:    v2.3.7

Merge branch 'MDL-39398-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

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 3e7b95b4310356264c436308f63179a656096e11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:53:49 +0800
Tag:    v2.4.4

Merge branch 'MDL-39192_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 2a6c9c15365844f758bccfeaf9b5b82a5bedcb11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 29 Apr 2013 06:53:33 +0800
Tag:    v2.3.7

Merge branch 'MDL-39192_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 b920c4096cdb3dadb314f2745a6a2e0f1e169150
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:02:14 +0800
Tag:    v2.4.4

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

commit cbf837ce04141eebb56042d39d0501fbb0a90bb2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 22 Apr 2013 07:01:42 +0800
Tag:    v2.3.7

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

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 d7b2888810c68676af74cd3956eb4a996f73376f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:36 +0800
Tag:    v2.4.4

Merge branch 'MDL-39185_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 8be4f7da651ada2c07ed6ddae36c0f7bb0d85ce6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:53:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-39185_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

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 aec4f1e956444ffd723cec4902c0f92b089d869d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 19 Apr 2013 09:48:07 +0800
Tag:    v2.4.4

Merge branch 'MDL-39135-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

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 c2cef5809eb34867ec46c269fea90226caa94206
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:23:09 +0800
Tag:    v2.3.5

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

commit af27002b54c6c54801154a57aabbcac1e56fbbd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 10:22:57 +0800
Tag:    v2.4.2

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

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 b0aca71569d62476c4f664d2bf2de9d5ed67e363
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:29:49 +0800
Tag:    v2.4.2

Merge branch 'MDL-38101-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 180e1b2fe92d7f22015d27d30e59bf5fe1d3e3b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 05 Mar 2013 04:29:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-38101-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 892ee7ee5636dfb6342913a778e227ce372312d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:12:54 +0800
Tag:    v2.4.2

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

commit ac19bd186a6ec70a977494a8093aab03060c2e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:12:43 +0800
Tag:    v2.3.5

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

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 fb2ac5029c39a9a2de794b9c08a74a9396f774de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:07:59 +0800
Tag:    v2.4.2

Merge branch 'MDL-35127-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit fa5509b73c560aaace1ad167db3fd5a680ab1607
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 11:07:51 +0800
Tag:    v2.3.5

Merge branch 'MDL-35127-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 b158bcce98c7e6b32d924b90121358d48c1af7ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:33 +0800
Tag:    v2.4.2

Merge branch 'MDL-37625-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE

commit c3a1ea1843e2d94a7a8a229b80a8f1cfb58a31a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 09:18:19 +0800
Tag:    v2.3.5

Merge branch 'MDL-37625-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

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 6a218739e4507598293257fa18168046d4622d5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-36128-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit 8e7afd6bf52285c3d3a6be7f69671c8b127b206d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:59:21 +0800
Tag:    v2.3.5

Merge branch 'MDL-36128-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE

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 4ea25c227c12955638ea9288d90da6e360f20fe2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:35:00 +0800
Tag:    v2.4.2

Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit fb3f9c4a50e0522f87face9083346329ab531350
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 08:34:47 +0800
Tag:    v2.3.5

Merge branch 'MDL-38168-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 b62c8a06ad16f265362c1a20463e91ccf41dc582
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:31:30 +0800
Tag:    v2.4.2

Merge branch 'MDL-32125-moodle24' of git://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit 0897b1eab1b70e326c7c002b6fed211a93dc287c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Mar 2013 05:30:24 +0800
Tag:    v2.3.5

Merge branch 'MDL-32125-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

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 823b45cb4926a34e350a4a622288bc67a2a89b85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 10:26:55 +0800
Tag:    v2.4.2

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

commit a515bc1b585be9b08fe76059775645bd246e9e9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 26 Feb 2013 09:25:16 +0800
Tag:    v2.3.5

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

commit 07f3c79dd4684d3633da524fe4028abb414dd0ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 31 Jan 2013 03:45:32 +0800
Tag:    v2.3.5

Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 3cb032512246b9ffe5d27a5c78fa7fdac5510053
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:23:45 +0800
Tag:    v2.4.2

Merge branch 'MDL-37476-stable24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 7b86ac4bbc00359c1c308f57293f1c294646301d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 10:23:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

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 bb5ebb62806a469645f28a7f15c3f08777b0dd46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 04:56:37 +0800
Tag:    v2.4.2

Merge branch 'MDL-37697-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 09a8ba4aa601590a6b3309abd4a7732de2ac4254
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 04:02:32 +0800
Tag:    v2.3.5

Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 6a1e56615254b1539dc04aecf9ba65e02faf52b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:54:52 +0800
Tag:    v2.4.2

Merge branch 'MDL-37350-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c5b346dc13a23d7c3be63610dc230eec31d6f15e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:54:42 +0800
Tag:    v2.3.5

Merge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 cd6e980e66023064a09e7a5677892467ca986f9f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:51:39 +0800
Tag:    v2.4.2

Merge branch 'MDL-36881-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 3134895c01483fa805b39ecdb6233305cded4dd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:51:20 +0800
Tag:    v2.3.5

Merge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 47795b21266953ef30bafa6de8d4c39839c51759
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:23 +0800
Tag:    v2.4.2

Merge branch 'MDL-34671-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 8108e113b34871128e9e9831f6ee9c8b9b3a381f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:39:08 +0800
Tag:    v2.3.5

Merge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 21126fc5e8e7528a014bd3077deab2c7b70c4c3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:19 +0800
Tag:    v2.4.2

Merge branch 'MDL-37668-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 04093db18a77a44a1eb177c7215fdd7c7e87c1a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:33:01 +0800
Tag:    v2.3.5

Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 353db49bfb2b220036ebee0935f071a30775d9b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:28:12 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit adf01e854b7185179a2bae264f0dcacb91a45d5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jan 2013 03:27:23 +0800
Tag:    v2.3.5

Merge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

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 a9c75fdc751abab509d28f445cc800feff258425
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:59:48 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37638_m24_rolecloning' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 151d0c574dc5b32b0703534602896f9348bad39b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:42 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37713_m24_testdir' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit ab9008ffb0e9f62a927c67f64373cc9bd2c47e66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:53:29 +0800
Tag:    v2.3.5

Merge branch 'w04_MDL-37713_m23_testdir' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 611314c09652d70326c96d3c2a87a2d60467e0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:46:02 +0800
Tag:    v2.4.2

Merge branch 'MDL-37548-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c01e5b0cd6f1de9c322d0fe336ee755b2c059d23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:45:50 +0800
Tag:    v2.3.5

Merge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 3e72333f0c1084eae7dbeef5cc2197fe05ac4c2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:34:51 +0800
Tag:    v2.4.2

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

commit b0610c8bca91bfed49a51c2782d50f9b551b1c89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:34:40 +0800
Tag:    v2.3.5

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

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 e7a68ca01783a0bb07428e6b6276c1aa9ed5bda0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:29:09 +0800
Tag:    v2.4.2

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

commit c2e15c4619d3fd8475dc20c25eb923c9b071ae81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 12:28:54 +0800
Tag:    v2.3.5

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

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 72e5445732edfd2442a63699da3f3d34afa7a45a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 11:06:58 +0800
Tag:    v2.4.2

Merge branch 'MDL-13805_others_messages_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit d6fdc727ea7b4568c135f034a04a9dec1648136b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 11:06:49 +0800
Tag:    v2.3.5

Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit ac9b9f152c18384df3c7ba48eda6fd336fb91628
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:44:45 +0800
Tag:    v2.3.5

Merge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

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 4d572da1b38656d837a5bd30f32a9d785b2c2571
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:41:54 +0800
Tag:    v2.4.2

Merge branch 'MDL-37628-24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

commit 7ec3fd667ae987eefcb1ee6e1c5fcdd7386ac33a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:41:44 +0800
Tag:    v2.3.5

Merge branch 'MDL-37628-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

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 e86e05ebf0022c5708a3c2562d93a1233097da59
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:31:54 +0800
Tag:    v2.4.2

Merge branch 'w04_MDL-37407_m24_chineseunzip' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 452a704ae9b7d4b11bd09dd657a10c3a099a590c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 08:28:52 +0800
Tag:    v2.4.2

Merge branch 'MDL-37414_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit a83ce21dfba53bd3170ddf3dca1a9fc436f81fa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 07:02:35 +0800
Tag:    v2.3.5

Merge branch 'MDL-37629-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 362b124e69e2f2a554ba32b04640edcd4b2b9ee6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:41 +0800
Tag:    v2.4.2

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

commit b5fe549a3c0d3ec0d099cf3b50b512c87e4e28ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jan 2013 06:32:32 +0800
Tag:    v2.3.5

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

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 7700ec42c16334a93824f0c52d2297cd1590d6aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:08:14 +0800
Tag:    v2.4.2

Merge branch 'MDL-34435-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 3ad0ab4e67dd4204b221d0fa924b820553952992
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 23 Jan 2013 06:07:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

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 dc5e0d1665545002462f1fa7f5155b7d2d574008
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:31 +0800
Tag:    v2.4.2

Merge branch 'MDL-37563-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit 8f3ae32b888d57cf7cf66276eb94833b2df31161
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jan 2013 04:10:23 +0800
Tag:    v2.3.5

Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 bf14c15fb517583ff22907394571c8451d63d97f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:21 +0800
Tag:    v2.4.2

Merge branch 'MDL-37295-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit a2400fcf71b363f78b5d7d04618c50e535314f41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 05:18:10 +0800
Tag:    v2.3.5

Merge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 9afa0e696ea722ce87ff4b5e56eedc6479f0c755
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:46:14 +0800
Tag:    v2.4.2

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

commit cf7ace8a3713f274f35fce15e68e410a595c7d76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:46:01 +0800
Tag:    v2.3.5

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

commit c5d97a96e4872df051334deac5b772604d31e789
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:31:23 +0800
Tag:    v2.4.2

Merge branch 'MDL-36757_hidden_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit cfdc33bf08f6991fbe6174f88d436735eeae0692
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jan 2013 04:31:12 +0800
Tag:    v2.3.5

Merge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 728858263360ced308a5ea1ac625846e064870b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:23 +0800
Tag:    v2.4.2

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

commit 9bc178f3e616c19565bcfdba7722626d409d6193
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Jan 2013 06:03:09 +0800
Tag:    v2.3.5

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

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 2dcbaaa68c1ac1ca67fd9450613155f3631dbe7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:42:52 +0800
Tag:    v2.4.2

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

commit e5f6a755e785fde80082f106b0d2ef626f717e4e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jan 2013 05:42:36 +0800
Tag:    v2.3.5

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

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 b54015e60deab728fcbe19f882fa0bf6a5c456b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:45 +0800
Tag:    v2.4.2

Merge branch 'MDL-37048-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 0aa523614379fd9c6c2e9a3e47739b392084b9f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 09:08:02 +0800
Tag:    v2.3.5

Merge branch 'MDL-37048-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 7e7c23fcadd5e91da6a7185e82b6785a0206635a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:39:53 +0800
Tag:    v2.4.2

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

commit 34342983859a427ce4f1563279be3e7f9a6579ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 08:39:43 +0800
Tag:    v2.3.5

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

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 625098abc57b4a33018068454b4e7654847d3558
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:23:49 +0800
Tag:    v2.4.2

Merge branch 'MDL-36095-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit 7fa6857c3bd6c9224d7bb19043ab2bd6a7af9968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:23:37 +0800
Tag:    v2.3.5

Merge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

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 7977c782e8cfadb1e71793b3b48ef567f9aaa28e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:12:41 +0800
Tag:    v2.4.2

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

commit 39bad86b14023cfc92d7243d74297027644081a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 07:12:30 +0800
Tag:    v2.3.5

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

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 842524812a3aa6d271953650b01d1a794d7f6ed8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:46:01 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-37394' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit e824c58aa8dc7c9142ea23332f490646441b59b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:43:29 +0800
Tag:    v2.3.5

Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

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 80b6e318fbb4ba21846dc15c173f46624b7e6343
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:40 +0800
Tag:    v2.4.2

Merge branch 'MDL-37397-m24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 096bb297f7aeddbd631907b2376bb6050663953b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 06:04:28 +0800
Tag:    v2.3.5

Merge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

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 7c2046b727a173f80902f349560f6c23433c5b08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 05:59:47 +0800
Tag:    v2.4.2

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

commit 571c2784d6252c07fe44fedd8e7fefd12f2ed561
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jan 2013 05:59:23 +0800
Tag:    v2.3.5

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

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 d72a0aa2c8a6ac00d760091b6f5a0433c3dc6226
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:06:50 +0800
Tag:    v2.4.1

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

commit b7af1eee2d57516e64fc4fcea107d1fc96e5edcc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:06:36 +0800
Tag:    v2.3.4

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

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 2be82d5e13017bcb45fffa81760243864b6999d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jan 2013 09:00:23 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-35893_m24_perfinstall' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 e04f57c95b31720ebd9a434522caf251ffcf8fa1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:15:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE

commit fc77cb3d85278200d49ffa803934ca169d10ca10
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:14:28 +0800
Tag:    v2.3.4

Merge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE

commit 4e805e91c791d6dbbbe2e83fa61fc66d3735cd97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 09:13:55 +0800
Tag:    v2.2.7

Merge branch 'MDL-37161-moodle22' of https://github.com/StudiUM/moodle into MOODLE_22_STABLE

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 b9639c524d45863cd5ca4d167c677bd9833674cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:54 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-36212_m24_entities' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 178a5b4102cba92eb3969b0fd2f102e75646a286
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:44:36 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-36212_m23_entities' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 52817fdbbcd9508098bf2070a6edf78bb1c1c09e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:52 +0800
Tag:    v2.3.4

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

commit e6f5bd2633ed1d7f311905632369618be3f1b0ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:39:32 +0800
Tag:    v2.2.7

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

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 192cb8f89449ddfc4a13b1ea1e2aad6d1fd301f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:35:04 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37281_m24_othersnav' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 757376d7dd2635368d69566d95131a2f1f202a1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 08:33:45 +0800
Tag:    v2.3.4

Merge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 2d7c42275f190324949d7fb1b2a6ec2a7b49ce68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:05:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-36855-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit a68bc19fa6031a6a697f508baa21d4d04275f272
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 07:04:51 +0800
Tag:    v2.3.4

Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

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 49a66d4b68f9ad8531d2046ffffd1a7120a3f803
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:15:11 +0800
Tag:    v2.4.1

Merge branch 'MDL-16730-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit d9402acd03e114cd15245bbd7338f25f747e3b1b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:54 +0800
Tag:    v2.3.4

Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 75c6461ac17d3cf9287131cc369f0f30e1501499
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:14:40 +0800
Tag:    v2.2.7

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

commit 0fbadb557b046c29ebb093acfdaed96bba2b3e70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 05:01:13 +0800
Tag:    v2.2.7

Merge branch 'w51_MDL-37280_m22_langstring' of git://github.com/skodak/moodle into MOODLE_22_STABLE

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 1a5a5f8e9c9532fefc1e5a7e4ffcf008f4c1bec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:52:50 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37105_m24_catlimit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 2c6b79365b937b2fe6596bf6e28ab5e82b866ac2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:35:07 +0800
Tag:    v2.4.1

Merge branch 'MDL-29327_none_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit a3a84720d3c9b55041283f22327d3928c58a5bc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:34:52 +0800
Tag:    v2.3.4

Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 a589b0dc77c13fe0fafb03bbd134a6b40c12bf98
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:34 +0800
Tag:    v2.3.4

Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 146b7ac600754050c5479d8f6f2f6d244643116a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:15:21 +0800
Tag:    v2.2.7

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

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 0c1be2af2178fbb4c4309e6f2f5e12b35cbef8de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Jan 2013 04:09:25 +0800
Tag:    v2.4.1

Merge branch 'w51_MDL-37315_m24_ldappaging' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 b09c5ac837a52746e40d42ca0d801f9d07b10976
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:46 +0800
Tag:    v2.4.1

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

commit 185eff01fa4d89bb85ffbf351c932539fe02f0d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:37 +0800
Tag:    v2.3.4

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

commit 9c829ef34a3dbab56bd9b3d3188836e1a1b004b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:43:27 +0800
Tag:    v2.2.7

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

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 fec305739d9d9a32829c2e17b852b631529d6709
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 06:16:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 3124654247af515e5556715698ec3ab46efbbbcd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 05:55:19 +0800
Tag:    v2.4.1

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

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 9a57563b9ff8b738bf117cd09a6a7bab9c7f9796
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:44 +0800
Tag:    v2.4.1

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

commit 2c292b48da41ce48e1bb17d789889a2737fb7e14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:36 +0800
Tag:    v2.3.4

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

commit 7093fdd80639c794d5113b1d8a1c9c5e0df93082
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Dec 2012 04:40:24 +0800
Tag:    v2.2.7

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

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 730271af49dd0129d35a3cecb78612278eb504c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:42:49 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-36475_m24_zindexesgrrr' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 8a35efacd7c6016a4473ded45b9e7e0c1bbabb6e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:40:32 +0800
Tag:    v2.4.1

Merge branch 'MDL-36490_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

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 acb011dc20ba5df2f10a5fca0fcaac9f5c663efa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:42 +0800
Tag:    v2.4.1

Merge branch 'w50_MDL-37111_m24_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 59fc0958d6f0069518d135d4ddf99037e32c70c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:24:32 +0800
Tag:    v2.3.4

Merge branch 'w50_MDL-37111_m23_forumsinglefirst' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 a7a1adf4e095154501e75581aabc689946758bb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:22 +0800
Tag:    v2.4.1

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

commit b3f46160b4c679b34baa2cdd70632ff6528e78b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:12:11 +0800
Tag:    v2.3.4

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

commit e49fea7d9b6c06bfb2b89087cd772f16e17f23cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:11:53 +0800
Tag:    v2.2.7

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

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 5c65ad28b4a1eecb2d253f31bff387615e4b734e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:07:03 +0800
Tag:    v2.3.4

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

commit b61c5fa26ba850a60ab1ae7db9b1c446b57c1e04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 05:06:54 +0800
Tag:    v2.2.7

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

commit ddb5fb5980013f2f087dbcad3b6f9f0d3dfc197b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:57:11 +0800
Tag:    v2.4.1

Merge branch 'wip-MDL-35056-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 6c9a77ba0cd00c0b0cb665094aa5dd1969c0fcb7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:58 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35056-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit 5ac84901f0869d164befdb8dea1c48f12eeb7681
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:56:48 +0800
Tag:    v2.2.7

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

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 20da16bb775d9264b78271b2d62a7bb2e2c675d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:30 +0800
Tag:    v2.3.4

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

commit 54d50fdb8dc8daeaa2eb3d61682bc335d3c12848
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:51:20 +0800
Tag:    v2.2.7

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

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 cd281ce1b41aa06962d049dfa3c1695a996ea452
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:41 +0800
Tag:    v2.4.1

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

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 c20213441e70becc736a8f2ac60cee24a3cb3923
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:42:06 +0800
Tag:    v2.3.4

Merge branch 'MDL-29733_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 3ed2c641f481e1a14e08a67ba8c34bea2eb4bd58
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Dec 2012 04:41:52 +0800
Tag:    v2.2.7

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

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 3ad9a3fda38662ce994b830e05a5cab239ec7c49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

commit 9aca16cc0f05cdaf24edb5a6c89b75de58e11bf9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 06:09:20 +0800
Tag:    v2.2.7

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

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 1ce6bdd1ddb00b6599d0d8af277c696f9583d701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:17 +0800
Tag:    v2.4.1

Merge branch 'MDL-29805-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 1b39edd66227e4dd517b4ca105527b1ef4033e35
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:45:03 +0800
Tag:    v2.3.4

Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 05e6fefd56ad7281e2a1674d4a2755bcda9821c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:44:14 +0800
Tag:    v2.2.7

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

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 09fc0fde35e3cf3741bc829bfdb09daf48d42c5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:27 +0800
Tag:    v2.3.4

Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 6896e438c13ffda0ad27ce00b86dcf70987f880e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:38:14 +0800
Tag:    v2.2.7

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

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 c545dcad4ffc9ea7ce21062960d9bd5fdfc8a834
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:44 +0800
Tag:    v2.4.1

Merge branch 'wip_24_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_24_STABLE

commit 6e89cdb35ff941c701952a36d0cee9af8a5a41fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:31 +0800
Tag:    v2.3.4

Merge branch 'wip_23_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE

commit 2a5953c545fed9d993049d9995bc38682ef34d09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:34:19 +0800
Tag:    v2.2.7

Merge branch 'wip_22_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_22_STABLE

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 9e9dd64c351b8925618a493b2336d9a7530e75ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:29:12 +0800
Tag:    v2.4.1

Merge branch 'MDL-36321_message_participants_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit eb4933515075040302ea9d140d0decedf461c0cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Dec 2012 04:28:58 +0800
Tag:    v2.3.4

Merge branch 'MDL-36321_message_participants_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

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 39a36d7d7b1b4274c0888c31cbc55642ea9c19bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:08 +0800
Tag:    v2.3.4

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

commit f352dcddba680e448f379bd14dd54f65c3cad8a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:11:04 +0800
Tag:    v2.2.7

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

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 7027fe4538012a560d29a22254c932ad84330ba0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:19 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36731_m24_uploadestrict' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit b54470f497323a553b3af4fcfcc124f204d84d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 11:04:13 +0800
Tag:    v2.3.4

Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 237ea8768c92a70cfb3420371657b09a85244180
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:44:32 +0800
Tag:    v2.3.4

Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

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 6ff174587334cdbf517871d8e1a400fccd2ec76a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:42:08 +0800
Tag:    v2.4.1

Merge branch 'MDL-36916' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

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 a2630c08ae8bc44673f2ba15fdb442d5c5d405b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:35:04 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-36936_m24_composerdev' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 1c90b9976da578464ef7a199fc6d5e979a4d189e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:27:14 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37060_m24_sessinit' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 35cb0e4a4c94707d6aaf6e5ad10fd020b4b376e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:22 +0800
Tag:    v2.4.1

Merge branch 'MDL-36942' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 2e6538382a5c11615aa068990b4373c2f85ad59d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:17 +0800
Tag:    v2.3.4

Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit a4982907f85b2d69f4a4c23e08d15331de4a43eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:04:11 +0800
Tag:    v2.2.7

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

commit ada098890bd898478d649444c54c881b8c44fe63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 10:00:00 +0800
Tag:    v2.4.1

Merge branch 'MDL-36954' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

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 b74804c8a80704819880a27da7d65ca848fcf69d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:50 +0800
Tag:    v2.3.4

Merge branch 'MDL-36954_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 7439256bbdb85ebbfe13cb0c6a51f4fdf829775d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:59:45 +0800
Tag:    v2.2.7

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

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 b004c163ee13fc2b3fa8b7806be53f028a26992c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:53:49 +0800
Tag:    v2.4.1

Merge branch 'wip-mdl-37017-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 6d0c04c208b411e2c702e1f36e7bc33bc90ad4ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 09:44:21 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-37061_m24_invalidlang' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 eda1d3f37ab348669f0b021c4a0d7faf1c752ad2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:22:06 +0800
Tag:    v2.4.1

Merge branch 'w49_MDL-29442_m24_entityutf8' of git://github.com/skodak/moodle into MOODLE_24_STABLE

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 3c805e592c1567a77cbcca7abe449736db6a5f1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 05:10:07 +0800
Tag:    v2.3.4

Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

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 52d4168038b29ce17b965f7bd6ea3b66bb17bdad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:42:29 +0800
Tag:    v2.4.1

Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE

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 f1cf05cbbe2cd329207f6932eb6f440c21fe2529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:49 +0800
Tag:    v2.3.4

Merge branch 'MDL-36601-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 79b123d1bef6e58b0020dfd9caf07c291ecc7a34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:41:29 +0800
Tag:    v2.2.7

Merge branch 'MDL-36601-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

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 c6bd16545e13ec8ea1dc136fa1cf7558cd77465b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:16:43 +0800
Tag:    v2.4.1

Merge branch 'MDL-36805-master' of git://git.luns.net.uk/moodle into MOODLE_24_STABLE

commit 667dfa5e7c0af06b4bc951604ee5bce8fe1f033a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:59 +0800
Tag:    v2.3.4

Merge branch 'MDL-36805-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 6575ae513f735f0fa17319bbc977e08fe7648b82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Dec 2012 04:14:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36805-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

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 a9269beb9c990a483d54a6f1b9af535b3e95ffd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:31 +0800
Tag:    v2.3.4

Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 59fef8ff26efe4f495d099f6da142c02f4abb163
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:59:19 +0800
Tag:    v2.2.7

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

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 5e6b64571c440d3b96a916f970a88e5a7fc61e09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:33 +0800
Tag:    v2.4.1

Merge branch 'MDL-34592_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit e4a2de510c5989c1bcfc3bc081328ad2bb877d1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-34592_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 7c1b3e252366f9f02d864d77a2b3e41359c4f80e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:28:10 +0800
Tag:    v2.2.7

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

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 c446a0fca2bcfd86f1bded274ce151c1d0f04419
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:18 +0800
Tag:    v2.4.1

Merge branch 'MDL-36608_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 15e9d4c64a5f4a61a47e0faa6b6ee5fa898f2d66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:24:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

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 07f89a017c5104107487c295942756f2ee8b6e81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:25 +0800
Tag:    v2.4.1

Merge branch 'MDL-36978_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit b35e30e5bcc939e966b92df13402852de6d13df4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:21:08 +0800
Tag:    v2.3.4

Merge branch 'MDL-36978_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit ba66ee75231535eee7e0b3e1a87928423fb6c1e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:20:58 +0800
Tag:    v2.2.7

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

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 b8b1926e2f48cc0337f8c1e42c49ac6a81cb7ff7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:15:54 +0800
Tag:    v2.4.1

Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle into MOODLE_24_STABLE

commit 1f0e0ab503579d0824feb4602a9983061297c339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 09:12:24 +0800
Tag:    v2.3.4

Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE

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 2353df33a7061804aef8446e418195fad7c6f487
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 07:13:10 +0800
Tag:    v2.3.4

Merge branch 'MDL-36433' of git://github.com/itamart/moodle into MOODLE_23_STABLE

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 f382da5bf9b1ac9ef50c4a0054e86d08febce559
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:20 +0800
Tag:    v2.3.4

Merge branch 'MDL-36778-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 9c11280dc9f29bd070bd7cf90d40298adcda5d40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:51:08 +0800
Tag:    v2.2.7

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

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 0d7605389332707ce64cec26fc590c1d30dec806
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:47:44 +0800
Tag:    v2.3.4

Merge branch 'MDL-36887-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 46210e38e838960afc17cdba931f120ce82abec5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:35 +0800
Tag:    v2.3.4

Merge branch 'MDL-36640-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 180a9220e97659cd5892f8d83997d50c1a338cc8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 06:42:22 +0800
Tag:    v2.2.7

Merge branch 'MDL-36640-MOODLE_22_STABLE' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

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 532577bb97a8b31f53f8dc792598a9a727d0afff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:50 +0800
Tag:    v2.3.4

Merge branch 'message_nav_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 7c3ff6f6a6b352126a05e8c152e94704777c1a09
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:58:37 +0800
Tag:    v2.2.7

Merge branch 'message_nav_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

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 5b2b3bdaf8973db40d6134cc559da39245618560
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:54:00 +0800
Tag:    v2.3.4

Merge branch 'MDL-36761_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 4d0eabf19eacb39294be0a035b93c08458676136
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:53:47 +0800
Tag:    v2.2.7

Merge branch 'MDL-36761_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

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 0b4767ca50dfdf6f8e5d081c0cc282984ee34901
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:59 +0800
Tag:    v2.4.1

Merge branch 'MDL-34591_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

commit b88caf890d684b979363eea75d4733a168489313
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:33 +0800
Tag:    v2.3.4

Merge branch 'MDL-34591_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 9980628209878b6fa3eed5a1b695bdbd4990a375
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:48:19 +0800
Tag:    v2.2.7

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

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 45fd888c52c51fe58c7ddee5f027b26d319d1604
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:20 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-35221-MOODLE_23_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_23_STABLE

commit 59fdbc53b2464f0bd76d5642357894709901bb08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:41:11 +0800
Tag:    v2.2.7

Merge branch 'wip-MDL-35221-MOODLE_22_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_22_STABLE

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 f384987eadf5f9522af5d264297ae936220ace3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:33 +0800
Tag:    v2.3.4

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

commit e32da64ee478affe73436934a4329c8dd2c4735f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:33:20 +0800
Tag:    v2.2.7

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

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 4dd8a25f5ddb61920f176e8eb691cf018e443133
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:27:07 +0800
Tag:    v2.3.4

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

commit 624e1d1197a38a1b8dff226e7bab3ba0880eca64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:26:55 +0800
Tag:    v2.2.7

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

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 1b696de61bc654e82bd832499312a75db300145e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:44 +0800
Tag:    v2.4.1

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

commit 289f5e85e73daea1326ea11da5958ea84a09acac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:35 +0800
Tag:    v2.3.4

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

commit 0cdd8fe9d470642400182f969d38a09a40669e90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:23:25 +0800
Tag:    v2.2.7

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

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

commit cf0451133fa4f668e763e5909747ac82a761c279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:22 +0800
Tag:    v2.3.4

Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit 6b02b455a4341d97f19f21a0dafe1eaa2cbdbd4b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Dec 2012 05:19:13 +0800
Tag:    v2.2.7

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

commit 97df01569076f6f0bc1f110a90d127ecf54e2968
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:48:12 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle

commit 0b7a458885807313ada12471a902eff8f6c321c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:53 +0800
Tag:    v2.3.4

Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_23_STABLE

commit e6ee93d1a3ffa32c53d0fd7163d4837193956b68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:47:41 +0800
Tag:    v2.2.7

Merge branch 'MDL-36336_MOODLE_22_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_22_STABLE

commit 6167badf621556ae23cc07878312f1f3e4865a7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:41:42 +0800
Tag:    v2.4.0-rc1

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

commit 01afb8024f4bd601c2eb007fa79a67b95e9d23dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:41:35 +0800
Tag:    v2.3.4

Merge branch 'wip-mdl-36238-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 479f5b6e6d60af46f16bc1aaa944378d684a77dd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:40:30 +0800
Tag:    v2.2.7

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

commit 58014c562114a1525d03e9782ca4bff1322a0a0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:25:24 +0800
Tag:    v2.4.0-rc1

Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle

commit 03af084b52430fadba85b372f0343f2c5ed902cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:24:56 +0800
Tag:    v2.3.4

Merge branch 'wip-MDL-34530_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE

commit 2644c4f33a41be316a7e44d339b7393af1ce584b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:14:47 +0800
Tag:    v2.4.0-rc1

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

commit acd51c5217ddad0bfb2a6970542829f7f76ee7af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:12:53 +0800
Tag:    v2.4.0-rc1

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

commit 4254a7495c041a01aed5687cbb2a38461dc5894a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 06:12:30 +0800
Tag:    v2.3.4

Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit fd6ab92b1dc5052f3ad978a92091baf2b09da949
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 28 Nov 2012 05:57:09 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle

commit 0aa6247168f6445373b0361b944cc956161abefd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:38:57 +0800
Tag:    v2.4.0-rc1

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

commit a28e3a600749eb84dcf92f8e8e5e500df0ff9198
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:22:08 +0800
Tag:    v2.4.0-rc1

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

commit 13669ef4d8afa5dddac5e6be4756fd477bfae8db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:55 +0800
Tag:    v2.3.4

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

commit 8725c4401bf9d7ebc61353734a48f1d4c0b4ada1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:21:46 +0800
Tag:    v2.2.7

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

commit 7ad3fc1f80fe9adb88fea7c287192d5716a79841
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:10:37 +0800
Tag:    v2.4.0-rc1

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

commit 77f3688b2fed13c838eab607444845650ea77d8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:10:25 +0800
Tag:    v2.3.4

Merge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit fa8d78a4855ee35c976e2f81d4f109a2fd9b6a33
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 06:05:40 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36829' of https://github.com/kastashov/moodle

commit 75ca9964a5e51bc0bc1e1004dad838b9fd511aa7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:41:41 +0800
Tag:    v2.4.0-rc1

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

commit 4c14127cdbeb97c1cf3f4d45f925616638b97c85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit d6347b056df3276710c14ced12ca89ecf2d49af7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Nov 2012 05:40:20 +0800
Tag:    v2.2.7

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

commit 8a423efda9684a889458141d4f81af669957df55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:58:13 +0800
Tag:    v2.4.0-rc1

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

commit 55f8a9c7666230fe27362e38a8ed59c8771bd37a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit f3fc480228316c99ef76edc4887f08adfd0c66f2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:57:31 +0800
Tag:    v2.2.7

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

commit 4d9e8469e12fa5e37909d8499fe6c000c333986b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:46:25 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle

commit 176207119416e683f754edc25666c29eff97496e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:40 +0800
Tag:    v2.4.0-rc1

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

commit f9fa262aa92f05d066ee03016d9af513527a4158
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:27 +0800
Tag:    v2.3.4

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

commit 066fc70ece13cea72aa5661aab7af30643bc0779
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 09:44:09 +0800
Tag:    v2.2.7

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

commit 93e490613ebf8f28ed4c930dfe672b4366c41617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:42:28 +0800
Tag:    v2.4.0-rc1

Merge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle

commit 8f718da4371f3bab75efebe0c0e89c153e8df25d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:42:13 +0800
Tag:    v2.3.4

Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit c7efe8b783213d1751af5875b37cf06cbd6db258
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 06:01:15 +0800
Tag:    v2.4.0-rc1

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

commit 6254d1d2eed27689b4157a1129bf0a70d445e86d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:40:58 +0800
Tag:    v2.4.0-rc1

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

commit 703b86eefbf4b529295ee36d040ab4df94a1b5e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:31:57 +0800
Tag:    v2.3.4

Merge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

commit f1a90cc4fedc23bbbf25bc9422b80c457ba00275
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Nov 2012 05:24:42 +0800
Tag:    v2.4.0-rc1

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

commit 82053086bcf41096af40efc164f4d66a38c41d9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:15:34 +0800
Tag:    v2.4.0-rc1

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

commit d540132fb57f9df26f9c600aacb0b5d110a0a1cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:00:35 +0800
Tag:    v2.4.0-rc1

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

commit fa99332779da6fe33909bf5e8e275947be19de4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Nov 2012 04:00:17 +0800
Tag:    v2.3.4

Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

commit 4d7259e53d3a2ff758ef7d4c2024e78d0558cbd2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 11:42:52 +0800
Tag:    v2.4.0-rc1

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

commit 0d463df0728ad54328bbeb1430074472139747b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 06:55:12 +0800
Tag:    v2.4.0-rc1

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

commit 41d17e48c76ddd971435a7a726dcd694cf5d4294
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 06:51:13 +0800
Tag:    v2.4.0-rc1

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

commit cb33680c2279a31a563dd019a0d6212a282b8abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Nov 2012 05:25:04 +0800
Tag:    v2.4.0-rc1

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

commit 41439e6c8d530025a6d2cee4a454a5cebaa94fbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:58:48 +0800
Tag:    v2.4.0-rc1

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

commit 99072482f656198eca1a783ea18d26f54b366827
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:22 +0800
Tag:    v2.3.4

Merge branch 'MDL-36589_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit b7696aa0b6d901e8740a06d42016b0c2ec51eb11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 Nov 2012 09:55:13 +0800
Tag:    v2.2.7

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

commit f89a1a88765c5f5ec5ed3e6fad3ec4cda99c798e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:30:49 +0800
Tag:    v2.4.0-beta

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

commit 24f4515576c4b2f00b28b72d8ce0cb0fa1a36cc0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:07:15 +0800
Tag:    v2.4.0-beta

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

commit 62d543748d15f33beac397ce06999572dcd760a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:58 +0800
Tag:    v2.3.3

Merge branch 'MDL-36271_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit e3071745bbc38da2452eecad041609dc9fafe152
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 06:06:41 +0800
Tag:    v2.2.6

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

commit 9a0e6f147d0d6f964152e2cd915fa384399e4ab1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 08 Nov 2012 05:57:52 +0800
Tag:    v2.4.0-beta

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

commit 5252ec82a238e8e4ac3eb21bc00f82810d29ac11
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 06:00:16 +0800
Tag:    v2.4.0-beta

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

commit 02adb1e30d33731e9b6bd012cb6ea90baf1ea205
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:34:06 +0800
Tag:    v2.4.0-beta

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

commit 2ede3d7f3569a58a290314bd27c9b07699fa0cdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31629-master' of git://github.com/micaherne/moodle

commit b733b0ac71b830707465a0245e547b6b6c7b7af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-31629-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into MOODLE_23_STABLE

commit 3e8532dadcb8d04ca8cbc73cda13abb6a9d1584a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 06 Nov 2012 05:08:22 +0800
Tag:    v2.2.6

Merge branch 'MDL-31629-MOODLE_22_STABLE' of git://github.com/micaherne/moodle into MOODLE_22_STABLE

commit 544c4553579475e7fbb431e6249dcef40f272279
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:43 +0800
Tag:    v2.4.0-beta

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

commit 18f6238b88d353a8f4533679828b2ad40813b94b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:30 +0800
Tag:    v2.3.3

Merge branch 'MDL-21625_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit fdd57e090e235d994f3fc77bba46d31f1fcaaa9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 11:27:15 +0800
Tag:    v2.2.6

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

commit 1385f1d8fb740488a85bf87285adc8a394cebb28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 10:07:21 +0800
Tag:    v2.4.0-beta

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

commit a82535f068cdcb47836faeab93d2d88af3754f90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 10:07:00 +0800
Tag:    v2.3.3

Merge branch 'MDL-36107b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit c575fef5ece1d94875c47342f648d6567852e4eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 05 Nov 2012 03:35:25 +0800
Tag:    v2.4.0-beta

Merge branch 'm24_MDL-36359_Typo_admin_rediect' of https://github.com/scara/moodle

commit 84582748454d3f52b3b5081c4883f65856b26e85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 12:35:18 +0800
Tag:    v2.4.0-beta

Merge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle

commit eecddb8fd47877fc0cbaa212ed66011703b1b20e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:44 +0800
Tag:    v2.4.0-beta

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

commit ee8c1abcea617220512a8487aa285292f4b67e3c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:29 +0800
Tag:    v2.3.3

Merge branch 'MDL-31934_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 61f0581a022aa0cd8cdbd269461f7ce60f5c339a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 31 Oct 2012 05:15:18 +0800
Tag:    v2.2.6

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

commit 81b5ff0e8e2938395fdd71dca3c7ee015f2b80e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:37:06 +0800
Tag:    v2.4.0-beta

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

commit 3b6796e0f41f1ec02b269c15b7d4fb70d34a0fe7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:45 +0800
Tag:    v2.3.3

Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit e16c4341405be883688c83b4fa6df71b6c6b2faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 12:36:33 +0800
Tag:    v2.2.6

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

commit e118ad21c99d7b59fdb2f348754b89ab5eefd29c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 11:00:45 +0800
Tag:    v2.4.0-beta

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

commit c8757a3c8778c4ba3b72e7206c3ac6a95de9b740
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:54 +0800
Tag:    v2.4.0-beta

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

commit aa7d8ef61f60e5e1535c64040a6fb7ff342d925f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:49 +0800
Tag:    v2.3.3

Merge branch 'MDL-35889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit b277186a4ecd594eefa707d9631626e5b343712b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 10:48:45 +0800
Tag:    v2.2.6

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

commit 21d31a23a03b519f67141b725ac31fba5dae2157
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:31:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle

commit a9ab988e431242d52a0c83ea88c40004509cd679
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:02:24 +0800
Tag:    v2.4.0-beta

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

commit e61d57b5c152fc28c6b0717d357584ccce815b66
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 08:02:07 +0800
Tag:    v2.3.3

Merge branch 'WIP-MDL-36070-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE

commit 41b4e5ec7fd86e66d0912392fd3b54caff12ed89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:23 +0800
Tag:    v2.4.0-beta

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

commit 1d6d520a5a266651414c3e9043cfae70b7566f05
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-36076_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 0be66059a24915f055071be2d22ac6a92b23cc52
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:59:02 +0800
Tag:    v2.2.6

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

commit ca55ce4b355d9dfcb5ea40442d94193721d78aaa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:54:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-36101-master' of git://github.com/micaherne/moodle

commit ebaa74a3e0ceae58b9bf08a32d144d481feb5d67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:52:00 +0800
Tag:    v2.4.0-beta

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

commit 3b5513528eb2c1bedbc55c158b76eccc7f7c0c8a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:44 +0800
Tag:    v2.3.3

Merge branch 'MDL-36103_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 15b3f4332662c431fe03a8d41e723705fe7f4c0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:51:34 +0800
Tag:    v2.2.6

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

commit 86c0eb48ba3629cd26af7b5c2f6fca983e464d5a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:31:22 +0800
Tag:    v2.4.0-beta

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

commit 558aecf818af171cd19aae89147987cdfa6d6d27
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:24:31 +0800
Tag:    v2.4.0-beta

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

commit efd2f83e4a6eb3f056717df9735fd85b708fdefb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:24:19 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-36131-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 7080f72c73bf41873be6124e2c94a2e326e98001
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:17:11 +0800
Tag:    v2.4.0-beta

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

commit b9697365a1c25d0260eae86a2a5c4af0af4a4954
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 30 Oct 2012 07:16:50 +0800
Tag:    v2.3.3

Merge branch 'MDL-36137_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 7e5c720495154f3728c4a26947b178b6c8d45e06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 17 Oct 2012 10:57:36 +0800
Tag:    v2.4.0-beta

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

commit a896bc32cd9bfaffe19c3669fce4afef37ffb4d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:49 +0800
Tag:    v2.4.0-beta

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

commit 777354509d3ab3ba52ab9ed97dd7f6a58c48bf06
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:31 +0800
Tag:    v2.3.3

Merge branch 'MDL-35412-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit d3eb32a44e28d6c5d0a140700560b76ec8ecc05b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 17:41:19 +0800
Tag:    v2.2.6

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

commit 2bbf03ce3bc80d387a025343bc5ffaa5478997bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 13:31:44 +0800
Tag:    v2.4.0-beta

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

commit 4740c0a64f76d448f40f7c4dda98df8d9f357612
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 13:31:31 +0800
Tag:    v2.3.3

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

commit 8422094d912293351605371cad82899663666678
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:23:24 +0800
Tag:    v2.4.0-beta

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

commit c35fa27c89170314a336198a80251b819174659e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:23:02 +0800
Tag:    v2.3.3

Merge branch 'MDL-35198-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit d270f6c22d314dd43b8d2e24a3fc165586aede74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:22:44 +0800
Tag:    v2.2.6

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

commit 58e033193f86e8c6845998908edc227419b46d92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 11:16:33 +0800
Tag:    v2.4.0-beta

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

commit a7aa82b3ac7f09dd732837ce62dced921b799221
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:42:51 +0800
Tag:    v2.4.0-beta

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

commit 52d2556ee557a9e80ea560f2c2c2685e1f12e55c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:42:42 +0800
Tag:    v2.3.3

Merge branch 'MDL-35664-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit d6361e618a0240281e46b174a03bed32059908e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:31:56 +0800
Tag:    v2.4.0-beta

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

commit 86606ad75dca1839fec9432ac4827a8b6dcd0a0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:31:51 +0800
Tag:    v2.3.3

Merge branch 'MDL-35892-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit efd6156e4d035568c245e902ad58e95bb9c9729d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:16:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign

commit 5004ad85b7e2f03f21b5d898ead7dfffb422895c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:16:19 +0800
Tag:    v2.3.3

Merge branch 'MDL-35726-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit ee17d12db16ab41af8733099db504d1d950e26a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 16 Oct 2012 10:11:04 +0800
Tag:    v2.4.0-beta

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

commit dc67f522cff23b0fb292966d99aab8a7006833f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:57 +0800
Tag:    v2.4.0-beta

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

commit cafabb5fd01e1570dc82109d40c3107d0907467c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:21 +0800
Tag:    v2.3.3

Merge branch 'MDL-35634-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0766ae0049b5772af6ca9e9cfa564e45345fa2f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:36:12 +0800
Tag:    v2.2.6

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

commit 382d11a43c202c4a92167ebcb2b60ea89f5acc02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:18:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle

commit 68b9d1f408dec48003b68a706e364061afee916a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35211_master' of git://github.com/kordan/moodle

commit fff33fd66d5db77bc1bd6ba4c361611a3ee11184
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:33 +0800
Tag:    v2.3.3

Merge branch 'MDL-35211_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit c11496e22da1338f9d63c9865dbee1c224f03aa9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 06:02:24 +0800
Tag:    v2.2.6

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

commit 30939d2a9a45875ac7c2673b3de0be01707e0616
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:44:18 +0800
Tag:    v2.3.3

Merge branch 'MDL-35763-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 2a00249df5322f8fc7f3c2f28c299373caea18da
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:44:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35763' of git://github.com/netspotau/moodle-mod_assign

commit da2ebe0474483352b3abdd15fd94eaa00c62ecca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:40:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35764' of git://github.com/netspotau/moodle-mod_assign

commit e8edb00c7352f41c4f8890f327218be246cb5ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:33:48 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34992' of git://github.com/nebgor/moodle

commit 9201c33bb77bff1753a5488e035903222b11f1d7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:22:18 +0800
Tag:    v2.4.0-beta

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

commit 8c2eca7d163e1a4a2e6459db9104ccda37c6226b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:22:06 +0800
Tag:    v2.3.3

Merge branch 'MDL-33646-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 2a2d855e14e2bd5088e3a6a2f2f41443dbcec099
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:49 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35667_extra_credit_loop' of git://github.com/andyjdavis/moodle

commit f605b97aa4f5f755be87e8226afe879934076b25
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:37 +0800
Tag:    v2.3.3

Merge branch 'MDL-35667_extra_credit_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit ac78fb7625c5f661878ecec7bbf2b65f41a7346f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:15:29 +0800
Tag:    v2.2.6

Merge branch 'MDL-35667_extra_credit_loop_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 4c5f42b400f89d1a163943e1e571d2e73beeb163
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:06:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35730' of https://github.com/aolley/moodle

commit b855945836343604f6b198d771e795d3218d4484
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:06:12 +0800
Tag:    v2.3.3

Merge branch 'MDL-35730_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE

commit 4f012c5e581f28f4d5c655e92f28646eac02a02d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 08 Oct 2012 05:05:52 +0800
Tag:    v2.2.6

Merge branch 'MDL-35730_22' of https://github.com/aolley/moodle into MOODLE_22_STABLE

commit 40b26758db2ef1e3cb09eb733b4d1780bc7ad9fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:37 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33829-master' of https://github.com/andyjdavis/moodle

commit c67ed6adfe88ea0b378fbb9c287ce75b7d898967
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:16 +0800
Tag:    v2.3.3

Merge branch 'MDL-33829_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit bd465e3917e0ab451a7a18e5216431cc91d81b70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 05:07:04 +0800
Tag:    v2.2.6

Merge branch 'MDL-33829_22' of https://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 9289c14e0c81f1a044909b040cd6c68fc46f083a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 04:53:11 +0800
Tag:    v2.3.3

Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit a0251e5006e8f59d4c8b2e90d8f6558612fec3a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 03 Oct 2012 04:53:05 +0800
Tag:    v2.4.0-beta

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

commit ee3502e793a041befaf3637a3264f729fa7e7724
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:39 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-35472' of git://github.com/totara/moodle

commit 577777cf03b120ea9da05d89cfcaae74ad934991
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:24 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35472' of git://github.com/totara/moodle into MOODLE_23_STABLE

commit d5cb1a40966f9bea25173c97adb7bac2c3e94597
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 06:10:13 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit e737ad93a1c8159823439d9434d764b7f7c7c10c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:46:01 +0800
Tag:    v2.4.0-beta

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

commit 500ade05cb6defc8174278947273902ebaf975aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:51 +0800
Tag:    v2.3.3

Merge branch 'MDL-34257_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:45:44 +0800
Tag:    v2.2.6

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

commit cf452060062556960a81c235a94ac270f52c15d6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:31:13 +0800
Tag:    v2.4.0-beta

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

commit 4891199f10e0868c2ecf54182c1dcb096bca233a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:31:08 +0800
Tag:    v2.3.3

Merge branch 'MDL-30885_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 6beec9ce60e617d1aab60b3f4a6ce6c9a4265d7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35547' of git://github.com/enovation/moodle

commit 50b252cdde3b4613276e6544d65cbc70b455f0f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:30 +0800
Tag:    v2.3.3

Merge branch 'MDL-35547_23' of git://github.com/enovation/moodle into MOODLE_23_STABLE

commit 7697512a90cf00c13581965d970057cfab2956a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 02 Oct 2012 05:15:19 +0800
Tag:    v2.2.6

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

commit 4aede312e7c2e9eb59903b10336ea312f4a5bca1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 11:50:56 +0800
Tag:    v2.4.0-beta

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

commit 41a5203c2a5b5964a2be00c89934434eb93936ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 11:13:33 +0800
Tag:    v2.3.3

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

commit 57264882c7fbde6bf4e6cf6c6f9caa21e7867c0c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 10:27:52 +0800
Tag:    v2.2.6

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

commit c89613edaaa372a3f5d75e1082f76a6b29132fff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:20:13 +0800
Tag:    v2.4.0-beta

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

commit 678e90a08004365902ae2f87ca5e1bc949da6ef3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:23 +0800
Tag:    v2.3.3

Merge branch 'MDL-34573_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 414568e1446cbc58a41f46f65fc84a6af73b53ed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 06:10:11 +0800
Tag:    v2.2.6

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

commit 86d055360cc9dfabd1280a30e997dcce916a2b50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:40:11 +0800
Tag:    v2.4.0-beta

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

commit 1172c2bd2f3c254cb27e95640d9bb53bf002bed0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:52 +0800
Tag:    v2.3.3

Merge branch 'wip-MDL-34476-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit d122b474567e9b1e560dd3eb6997ae3226910f63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:32:41 +0800
Tag:    v2.2.6

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

commit d998c1a4405a434e02f25b42748ce7927c2eb3a9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:53 +0800
Tag:    v2.4.0-beta

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

commit 4c6962068ae664731a6dbdf4b87ddfa3cfb56b51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:37 +0800
Tag:    v2.3.3

Merge branch 'MDL-31976-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 1b00f61d8763f5a9bc8e31a1f66133ff673fbc50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 26 Sep 2012 04:20:30 +0800
Tag:    v2.2.6

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

commit 22d38f8b2ead8532882f26505be4b08e27444691
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:54:52 +0800
Tag:    v2.2.6

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

commit 8a7cc012fd2f2e941ce32485614c26de7c03334a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:52:00 +0800
Tag:    v2.3.3

Merge branch 'MDL-34607-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 52ebfade63a90de4379623548d577f6e15911023
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:51:28 +0800
Tag:    v2.4.0-beta

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

commit fd0758da1b43bca789dc1feff530eb8f45f0810e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Sep 2012 05:23:27 +0800
Tag:    v2.3.3

Merge branch 'MDL-35375-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit b39e6f59d646eb2161c74e3b77a80dcc2648dfdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:54:04 +0800
Tag:    v2.4.0-beta

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

commit e1a809b36f5b2f42819410d96baec553b1315218
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:53:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-35312-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 3b9ed3037f85b3dfc57b310a0de88a74d83876d0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:42:06 +0800
Tag:    v2.2.6

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

commit 81a92474f274466d8461533b7495648741229bf1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:34 +0800
Tag:    v2.4.0-beta

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

commit 1e112f8801a6c6cddb3336d697d450c656c84172
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:28 +0800
Tag:    v2.3.3

Merge branch 'MDL-35517_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 782a1b46330c514dc6cdbe695555610de540714e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:21:21 +0800
Tag:    v2.2.6

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

commit d324d74e391c18733e8ca2f9e4bb038088ae72c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:15:05 +0800
Tag:    v2.4.0-beta

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

commit 9c8299972d99a721c7bed03622bde82eb4f61bad
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:06:25 +0800
Tag:    v2.4.0-beta

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

commit daa9be54c0c3dbcf50b32261e15999c4fee1c368
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:54 +0800
Tag:    v2.4.0-beta

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

commit 3c6510c106ce40440085dde3b5d15decc44d091e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:44 +0800
Tag:    v2.3.3

Merge branch 'MDL-30889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit d2621a28f58a015a8bf39392ce02d7c2f92c2071
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:35 +0800
Tag:    v2.2.6

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

commit 8272c63abfd0a6415632e891bf560bbc49208ecd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:05:01 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35389' of git://github.com/raymondAntonio/moodle

commit 91cb7bdab58eac874561a7d354ae2a9addcfeeb6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:03:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-35398-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE

commit 071128c9ace3d527f0dd177990bae6132f86ae47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:03:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35398' of git://github.com/netspotau/moodle-mod_assign

commit 7a01f7dbc1ad46d0b4dbeb82abb15dab560bd2a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 11:00:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35427' of git://github.com/netspotau/moodle-mod_assign

commit 66c0368a9e854997a2d5e2a712b4986e1f9b45fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 10:59:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35435' of https://github.com/raymondAntonio/moodle

commit 8ea8461b3f8e613fc4573a0a43dbbde208621797
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 24 Sep 2012 10:53:43 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33431' of git://github.com/netspotau/moodle-mod_assign

commit 36b76c1ff91dca31237dfc771bc1a121dffde59d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:47 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle

commit 04ec524d74dd1463d7fd053faf9c9123bca4a7cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:25:29 +0800
Tag:    v2.2.6

Merge branch 'm22_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle into MOODLE_22_STABLE

commit fd9a54c2e3cd1013d86c722c91607d4d007a51b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:19:30 +0800
Tag:    v2.4.0-beta

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

commit 77ef5e06f9291cc6360223c692102cc60b2a74ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:20 +0800
Tag:    v2.3.3

Merge branch 'wip-mdl-30667-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit b7367b9638154dcc3c38c4657a266473fc0532e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:18:03 +0800
Tag:    v2.2.6

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

commit 4113e2951e4c0de84a8a484571a05373bcb7a126
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:13:01 +0800
Tag:    v2.4.0-beta

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

commit cdf30c74d8c958b4dfe61ff6e2ce37988b542e42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:47 +0800
Tag:    v2.3.3

Merge branch 'MDL-29872_c_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 0686d3dc4c1ef1e1207b75255e7cd2c67eb4e68d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Sep 2012 07:12:37 +0800
Tag:    v2.2.6

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

commit 37d3caac5124287e2c945eb92c92a2c3062597f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 07:35:41 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34088' of git://github.com/raymondAntonio/moodle

commit 6aa130499b17d02c88f1825b456b6902a3cb5de8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 07:00:31 +0800
Tag:    v2.4.0-beta

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

commit 939d182d1e5faa451b34236c4e3e54f294a232d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:50:57 +0800
Tag:    v2.4.0-beta

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

commit 561cbb8967a6e0f2138fd7687f210d317cb08642
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:33:35 +0800
Tag:    v2.3.3

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

commit 1d26f4a5de5a1bca94049e0c11c4c90ec0659052
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:28:16 +0800
Tag:    v2.4.0-beta

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

commit bdd6847fc2a9d1989b6738ef8a29dafe8171a4f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:54 +0800
Tag:    v2.3.3

Merge branch 'MDL-30829-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit b95d2cc35e531301d3081fca3f6dd991dcb69dbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:27:40 +0800
Tag:    v2.2.6

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

commit 223285a6403f06d630ee946d5f474f8d8ebc83eb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Sep 2012 06:22:54 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle

commit f9959166ca98d8a595c51ec2107a5fdc10b51283
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 12:46:13 +0800
Tag:    v2.4.0-beta

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

commit d5e317882db6d94f9e96aac5a25083bf13efc9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 12:45:45 +0800
Tag:    v2.3.3

Merge branch 'MDL-35190-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 92a763eb55d4e62d02bbfe6697b0323774fe1821
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:32 +0800
Tag:    v2.4.0-beta

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

commit 6ab9c3e2ad119152a227842c816756e47e79894e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:20 +0800
Tag:    v2.3.3

Merge branch 'MDL-34765-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit ccbf68066bd381b0a5e240e992fedb923fad2d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:31:09 +0800
Tag:    v2.2.6

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

commit 1d856f68db1d9c51c2b02ba70b04500aa6d48091
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:22:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30018' of https://github.com/stronk7/moodle

commit bbd89d7b1059e112eef8f0f5409fd44cc4115333
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:59 +0800
Tag:    v2.3.3

Merge branch 'MDL-30018_23' of https://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 4340e2faace07f7eb45870cd789640515648a749
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:21:44 +0800
Tag:    v2.2.6

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

commit 35cd9f1f83f937f72b167e21afec0064564447ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:19:16 +0800
Tag:    v2.4.0-beta

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

commit 08153276ac9252eb03604f6e775c59ddf1372490
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:40 +0800
Tag:    v2.3.3

Merge branch 'MDL-10259_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:18:31 +0800
Tag:    v2.2.6

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

commit 84342b4e3c9e0395f04b37dbafbfcec2174fcb17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:59 +0800
Tag:    v2.4.0-beta

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

commit d27a76c3e3335b4bb411606170145e3b047818c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:48 +0800
Tag:    v2.3.3

Merge branch 'MDL-30857_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 22f55d840cf86cfa148027bfe7fa18259a90c438
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:10:39 +0800
Tag:    v2.2.6

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

commit 72258d36dbbfa36539a41e60f0ae1f78dc1f2e76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:08:11 +0800
Tag:    v2.4.0-beta

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

commit 60871abb53bafe7c51b284da04afb94a133e7d46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:02:30 +0800
Tag:    v2.4.0-beta

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

commit 6d661aa2f10da3cd7aa3bc64f31a7ca827f025e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 11:02:26 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-34755' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 6396fb3dabf3c7b08747c5a5f29208c7823e2925
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:11:02 +0800
Tag:    v2.4.0-beta

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

commit cb3a1e355bdf531de5316b3b39c33d8d6812b702
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:10:55 +0800
Tag:    v2.3.3

Merge branch 'm23_MDL-35255' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 4bf0aea9ddfbdd5145d4929c4b2a927402257b5d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:26 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34916_master' of git://github.com/kordan/moodle

commit 654338074ea161177eb982a7b743fe259f9388d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:14 +0800
Tag:    v2.3.3

Merge branch 'MDL-34916_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit b818dfc2d7e3c316b4a00b884bade3e7c625c7b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 08:06:04 +0800
Tag:    v2.2.6

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

commit f28896b6157f8b60c2a6779c4db3fbafec59d684
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:33:04 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle

commit 7c4fe15b2d8b53e5bd1b0616ddd15e46c1f42b8b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:45 +0800
Tag:    v2.4.0-beta

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

commit 74fae5244c162c9ef0c4ca43efc92a7ffe13ee51
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:25 +0800
Tag:    v2.3.3

Merge branch 'MDL-27786-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 94ff6cf6fb261c9274d42bcc71792936df51adb4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:15:14 +0800
Tag:    v2.2.6

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

commit 204ce6858beb2feead096a64d50a6122e702d14b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:39 +0800
Tag:    v2.4.0-beta

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

commit 1595c976dd094f1bc7485c118ce1095c2a895aed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:26 +0800
Tag:    v2.3.3

Merge branch 'MDL-33374-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit f50e16d07e26736040db2792cc70ce9f31a7a807
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:10:15 +0800
Tag:    v2.2.6

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

commit 27b1b2855274a106cd5fbf624c6a23442da468c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:07:29 +0800
Tag:    v2.4.0-beta

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

commit 5a05aa96335127122ccb3f0de9c0b9f1b1e0d2e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 07:07:25 +0800
Tag:    v2.3.3

Merge branch 'MDL-35007-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit c91614ef529cf864241faa31bd6e7405054716b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Sep 2012 06:38:23 +0800
Tag:    v2.4.0-beta

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

commit b5b82ae943836c4cbd19e99cd7c4f9627bd34029
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Sep 2012 12:50:36 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle

commit df4e81835a251ad0c90495ff6918b5508a252ef7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Sep 2012 12:50:23 +0800
Tag:    v2.3.2

Merge branch 'MDL-30022_message_duplicate_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 21a87e501af56c4974d08356947ad26f3a0be29d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:28:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35109-available-updates' of git://github.com/mudrd8mz/moodle

commit 8169e2f46bec5297cdce7b57323f9671a0ca4ff9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:28:18 +0800
Tag:    v2.3.2

Merge branch 'MDL-35109-available-updates_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit c367e7fe4e4ae7b6f0a8d310d4ccb179cedca023
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:38 +0800
Tag:    v2.4.0-beta

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

commit 3d1cbc0df3e7175f80e2526340f75bd33be98363
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:25 +0800
Tag:    v2.3.2

Merge branch 'MDL-31496_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit e40113160683514c35043456aca5ce0c47ad73b6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:20:16 +0800
Tag:    v2.2.5

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

commit 78cdd4cd414d88de558ceb32c0691052950d069c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 08:16:03 +0800
Tag:    v2.4.0-beta

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

commit c458ba6cd75deb9222ba185495d48fd33cc857d8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:45:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34991' of git://github.com/nebgor/moodle

commit 0363a5b3fa1227d1f2e80007cdc1ba114cc424cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:40:29 +0800
Tag:    v2.4.0-beta

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

commit bcbfd0257488020e3df6a4f3ed2d60c794b8cfa5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:26:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-26882-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit c0941ec9963dc38be6c94113bacaf2ba1b01ea75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 07:25:57 +0800
Tag:    v2.2.5

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

commit 05f7680f3e72d2598ed65b426a5ed2f1fb69c613
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:50 +0800
Tag:    v2.4.0-beta

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

commit f38508168f150303b5824dd6fa8446bcf57e2115
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:37 +0800
Tag:    v2.3.2

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

commit 926fffa1463316f62e55e350593be84fd056c3af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:12:15 +0800
Tag:    v2.2.5

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

commit f9e38429a851081f46c4cad34123ac1ab27a8d73
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 06:01:50 +0800
Tag:    v2.4.0-beta

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

commit 9f66e643903ac28d88ce2ff8ab46bf479d5844f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-30020c-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 1ac4b314f6f1ceb948c012ecf6ab89eb213dc9e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 03 Sep 2012 05:52:12 +0800
Tag:    v2.2.5

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

commit 0bb0f086ac1b9ec5cf6e65d440353755f66f704f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:48:40 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33640_master' of git://github.com/MaxThrax/moodle

commit 36e6961fa41fc20ed65fe6f22a5e22bb61b7533f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:48:27 +0800
Tag:    v2.3.2

Merge branch 'MDL-33640_23' of git://github.com/MaxThrax/moodle into MOODLE_23_STABLE

commit c52c03406404afe02ebcd556c1fbda5c6e3b9941
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:24:45 +0800
Tag:    v2.4.0-beta

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

commit a9c8c1c95144d9ed23d8432712f92a5f8d4fb56c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:22:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-33531_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 5d44dbd1eb2a2f7564a273a68a21f32f0266aa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 15 Aug 2012 07:21:57 +0800
Tag:    v2.2.5

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

commit d68a9af478261284f2cd31ababa9dab43c08de87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 09 Aug 2012 09:23:18 +0800
Tag:    v2.4.0-beta

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

commit e432bf2472a1564190f6d217d83e7be16c7f5d44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 11:05:39 +0800
Tag:    v2.4.0-beta

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

commit 563c436ece4bc1189ae927f677e6d7ca416b125b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 10:24:09 +0800
Tag:    v2.4.0-beta

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

commit fffe12fd95438a6006273c527eb552eacaf5fd1e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 08:07:59 +0800
Tag:    v2.4.0-beta

Merge branch 'wip_MDL-32412_afterburner' of git://github.com/lazydaisy/moodle

commit 60312b31895cc0ef65baa30bca5f2f8dc1f6fdfc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 08 Aug 2012 05:43:44 +0800
Tag:    v2.4.0-beta

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

commit 68690602185f698ecf113a20d1f156e22ff0c7c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 09:36:44 +0800
Tag:    v2.4.0-beta

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

commit b84be095b744447267884610b5961502cf3812a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:05:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34708' of git://github.com/nebgor/moodle

commit f52c5f8b6a147c699d3c69e66f17ec14be8fd44e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:05:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-34708_m23' of git://github.com/nebgor/moodle into MOODLE_23_STABLE

commit 5831c9f89103ce42edd39f4c05aecf3e85335623
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 08:04:40 +0800
Tag:    v2.2.5

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

commit 71761f8aa8729b0361bc8c363313a3497914b97e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:59:07 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28486-master-2' of git://git.luns.net.uk/moodle

commit a34c42bd5e1b7ce0a1a3bd69a59b0df398266303
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:58:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-28486-MOODLE_23_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE

commit 8cca2fbb6e9722627f12796405ac2e84e98027af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:46:26 +0800
Tag:    v2.4.0-beta

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

commit 98aa996a006b3d36b99475aa84edc464de1dd129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:24 +0800
Tag:    v2.3.2

Merge branch 'MDL-34658-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

commit 297e891c1fa4cc8e824f3f2f467ccbc9c5011d57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:44:09 +0800
Tag:    v2.2.5

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

commit e7ea7825d2c1510139beccbb9c6e0ce33b98aeb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:35:33 +0800
Tag:    v2.4.0-beta

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

commit 1dba7b9a40772283fd63eb9246696a96ea072d6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:05:24 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34645' of git://github.com/aolley/moodle

commit 3d84e69328368461a3f7a8ce409a6c7bf9e9d700
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:57 +0800
Tag:    v2.3.2

Merge branch 'MDL-34645_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit 07d8e5cfa7cd990b7e389fd68f634a5d71f86a94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 07:04:47 +0800
Tag:    v2.2.5

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

commit eff3e7f6776250f395b43b94704b79ab9b760412
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:59:10 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34647' of git://github.com/aolley/moodle

commit 9d705d49015ab7b417358f863ab32a315b777094
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:44 +0800
Tag:    v2.3.2

Merge branch 'MDL-34647_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

commit f5543aa05e8c5ea5ed7c82ed1aad6bcfc4cd66af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 06 Aug 2012 06:58:18 +0800
Tag:    v2.2.5

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

commit 90105eb95aecc89acc016442e7abbaeebc76ebbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Aug 2012 09:21:03 +0800
Tag:    v2.3.2

Merge branch 'MDL-34534-MOODLE_23_STABLE' of https://github.com/micaherne/moodle into MOODLE_23_STABLE

commit df0d0fdee728973d02ec92e227516ac6a5f2d8b9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 01 Aug 2012 08:35:19 +0800
Tag:    v2.4.0-beta

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

commit 118530e6053872e65743914ee5df1b3e33452efc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:57:32 +0800
Tag:    v2.4.0-beta

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

commit acb533009f7a964d368026a96230f5eb2265e9ae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:31 +0800
Tag:    v2.3.2

Merge branch 'MDL-34528_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit b21f1749576804e087f3c3a0fcabbc5dd8da1fd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:49:20 +0800
Tag:    v2.2.5

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

commit 6cb03ab5d34861e315e929f94c068008e7d28f39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:40:37 +0800
Tag:    v2.2.5

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

commit 5adf3ec6cbd7de53d01653db4b27f185cfa2c397
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:30:05 +0800
Tag:    v2.4.0-beta

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

commit 3c3cf6daaca3fa55e968f38da474c15d2953dad9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:51 +0800
Tag:    v2.3.2

Merge branch 'MDL-32499_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 09c3821bf47e6a4bf861bbeb7bcccc5d98f0dd4a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:29:41 +0800
Tag:    v2.2.5

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

commit fd892c6f90aeba75843b1d084fa7099db457f02b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:19:01 +0800
Tag:    v2.4.0-beta

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

commit fe2ff1e8a0fce18a65339ed1b07ad0cc106a9621
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:50 +0800
Tag:    v2.3.2

Merge branch 'MDL-32931_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit dd204f3a8f660d2f0229d64bb291962d35dc2f8f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:18:41 +0800
Tag:    v2.2.5

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

commit ac88177985338362dc71dcbcf6e94186abe6fd46
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:16:14 +0800
Tag:    v2.4.0-beta

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

commit dddd0d7a38a853b34f09e2203adfe0a79ec2a3cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:59 +0800
Tag:    v2.3.2

Merge branch 'MDL-32827-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit ab474e3e6d2c033687ac5852535a5f378ecd2078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 12:15:49 +0800
Tag:    v2.2.5

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

commit 989e5c49fae9f6aa39f28df2dc2ec7364db6c52d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:43:44 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle

commit d4533f621535101b3e151fa9d313d1f3eeeebfdc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:43:32 +0800
Tag:    v2.3.2

Merge branch 'MDL-34494_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

commit 7d5f2ac2e628814043e5b99921d9add402bcc021
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:05:38 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle

commit 30585a3752aa8bba35d0f03506966013c4e58c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:00:53 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle

commit eec3d1869d29ae8d727168a3bfbbe4546a0cef6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 08:00:42 +0800
Tag:    v2.3.2

Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit d3fd4849ae74dbb0f488965027c2615d4bb89956
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 31 Jul 2012 07:59:02 +0800
Tag:    v2.2.5

Merge branch 'MDL-28568_noncontact_warning_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit d5a81fadbf67d3c54372e330c32894f12644cafa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 12:25:04 +0800
Tag:    v2.4.0-beta

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

commit 3e23eb683886b9c4130f82c44324109b4da896df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 07:13:28 +0800
Tag:    v2.4.0-beta

Merge branch 'w30_MDL-34475_m24_saveondefault' of git://github.com/skodak/moodle

commit 5986099daaac9c3ca2d7cadd8800bbd78d7a8df5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 07:13:16 +0800
Tag:    v2.3.2

Merge branch 'w30_MDL-34475_m23_saveondefault' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 61e93a4c0832d6a9ea09dcf7d1775ef1b90f844f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:20:44 +0800
Tag:    v2.4.0-beta

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

commit ea268875fb1398bacc71559283d2e1709799393d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:19 +0800
Tag:    v2.3.2

Merge branch 'MDL-27083-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 775673d4b16d311b27411772c9eb882da4da8143
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 25 Jul 2012 05:18:06 +0800
Tag:    v2.2.5

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

commit b016e23594862dcd69bb3eca87e72296a2141d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 24 Jul 2012 07:21:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34352-master-2' of git://git.luns.net.uk/moodle

commit 395b805f97caaf366aa5f4257f7133c11910e12b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 10:04:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34225' of git://github.com/nebgor/moodle

commit 9e50c8d1e7f2f9449d68f39ddd1b7afb07e9e891
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 09:39:11 +0800
Tag:    v2.4.0-beta

Merge branch 'w30_MDL-33180_m24_simpletest' of git://github.com/skodak/moodle

commit 4c21d0da952c65cacd4081d97221d05aa8592f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 09:36:45 +0800
Tag:    v2.4.0-beta

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

commit 18989c7a24161b56bb42ff0ca79d7efab3fc77d4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:52:35 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle

commit df490747711683e8bbb672ac4fcfa332b25f6015
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:48:46 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-24298-master' of git://github.com/micaherne/moodle

commit 11946cada066c7e6457a7c584b80129c4b67b987
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:42:23 +0800
Tag:    v2.4.0-beta

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

commit 4094913d5381dd3a17d3ed7c00d08749112a7090
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:42:12 +0800
Tag:    v2.3.2

Merge branch 'MDL-34412_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 97918ad5861802588e7a79c8bc06eedce914525a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:40:08 +0800
Tag:    v2.4.0-beta

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

commit f945ffb908eaa58f6a1253c49c3ef915f1737831
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:39:59 +0800
Tag:    v2.3.2

Merge branch 'MDL-34370_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit dedf660f86f19a051d701b7bd4c34910bdbcfa87
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:37:40 +0800
Tag:    v2.4.0-beta

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

commit a7b2d087270a93e65a51110738fbf1f8fea232b1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:31 +0800
Tag:    v2.4.0-beta

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

commit 6fcebf2424df5169828d45d9f202ca6cc61d402f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:20 +0800
Tag:    v2.3.2

Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0fd928ddeb35a4476a856538b35a1a107d652aa0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:25:09 +0800
Tag:    v2.2.5

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

commit 9d1594b04bf9f6e7ac497cad07d0afd9888514c9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:19:58 +0800
Tag:    v2.3.2

Merge branch 'MDL-31516_grade_comma_decsep_moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

commit fc994304a224ddaa29356b362c4666d5d553d8af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:08:15 +0800
Tag:    v2.4.0-beta

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

commit 87608b34f497142475989f8f2197c690465b3ec1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 08:00:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33927_enforce_max_attachments' of git://github.com/davosmith/moodle

commit 6d8b85ff824ab9c9b3debf77c81a6831571b312d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:57 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29563_master' of https://github.com/dmonllao/moodle

commit 2372ccb77427adbfdcc17e8881a1f3f453956f97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:39 +0800
Tag:    v2.3.2

Merge branch 'MDL-29563_23' of https://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 71268ddb625d110db3de4e8125d0a5182217fbbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:49:28 +0800
Tag:    v2.2.5

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

commit 4ad0926a30e46c96b479f86a03e6ff2aaf9cdaa4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:40:07 +0800
Tag:    v2.3.2

Merge branch 'MDL-34427' of git://github.com/jasonilicic/moodle into MOODLE_23_STABLE

commit f49eff005ed03aebe19ae3739c5983579ab72b50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:38:19 +0800
Tag:    v2.4.0-beta

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

commit f315e3e184a3cabef6a3b7bc28b6d040769fed34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:38:09 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 82bb3c039caa75a3409ee1aee4136804c0bf81e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:37:59 +0800
Tag:    v2.2.5

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

commit ce4182a46a31ba48c2dbb9f0a1c75592bb3443af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:59 +0800
Tag:    v2.4.0-beta

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

commit 93c3b29893f8c4d432d9f1501ebd06c680a2c99e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:50 +0800
Tag:    v2.3.2

Merge branch 'm23_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

commit 5e202b6cb4991990381f33cc85d2b107780b0c16
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:26:41 +0800
Tag:    v2.2.5

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

commit c41e682c27d5e739db12ab3e749a771b84ae0db2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:22:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34313' of git://github.com/netspotau/moodle-mod_assign

commit 1d434a6d1703d1614ef8ca1fc3cdc3dd69f9bd13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:20:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34272' of git://github.com/netspotau/moodle-mod_assign

commit 5b2b9e04ef45ed3044d76f2cb6155c26b34cfe12
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:09:28 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34256' of git://github.com/netspotau/moodle-mod_assign

commit d817a9e52e3724a4ceadbbc223fa1be4fdeeeea2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 07:07:30 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34067' of git://github.com/netspotau/moodle-mod_assign

commit f3a6fa396ee4256ed36061d66773a8767916f97b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:54:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-2283' of git://github.com/netspotau/moodle-mod_assign

commit 30a47aea87c74526510e440ae80650b043ebdf6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:56 +0800
Tag:    v2.4.0-beta

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

commit 28ea78bf7a6e8445bb6a5b4d52d78b7ed6988cee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-34265-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 5f6c20bca20bfdbbfd2c1f5dd8cfabd3e6745588
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 06:39:30 +0800
Tag:    v2.2.5

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

commit d9416fba03ab5a7b772d99343ced86212b477738
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 05:43:17 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34322-master-1' of git://git.luns.net.uk/moodle

commit 8afee51adb95adf0dcf2bbcf5198d4c0c3165239
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 23 Jul 2012 05:37:29 +0800
Tag:    v2.4.0-beta

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

commit d7e0d2cb08158afedd9e9f6c6b1d0caa71b9f9ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:25:28 +0800
Tag:    v2.4.0-beta

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

commit e260e8ce571b3b97cafb78641f127cd88294db82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:19:52 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32948' of git://github.com/netspotau/moodle-mod_assign

commit 5f7ee647ff985cd7b5cab4049804c038354a6f4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:12:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34217' of git://github.com/netspotau/moodle-mod_assign

commit 7ee23e554d5ebc3dfe0b6bf256bc01f8fda8d1e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 06:05:31 +0800
Tag:    v2.4.0-beta

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

commit 2fcd79c0437c58ac341dc8cd9615351e83aad3f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 05:41:42 +0800
Tag:    v2.4.0-beta

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

commit 4d9f21a27e51f37150b990a41aa6b4af0ed0822c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 18 Jul 2012 05:33:00 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33874-master-2' of git://git.luns.net.uk/moodle

commit c1483c9c6cb71de4d39eebf8b2dcdde735f26e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 13:38:16 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle

commit 51625c4662cfc4b102da496b6bbbf963ce0698e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:19 +0800
Tag:    v2.4.0-beta

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

commit 07cb7e3d34e31d44b0514d19949b73ba1a6d65b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:08 +0800
Tag:    v2.3.2

Merge branch 'MDL-33575_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit bff217f18b095e3dfc56912ceba41ba54fbf342a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 17 Jul 2012 11:50:00 +0800
Tag:    v2.2.5

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

commit 775d9777103b60b77fb8298e57d289d4dbec722b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:51:07 +0800
Tag:    v2.4.0-beta

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

commit 5320640ccdde9a3c9790d26d39bf1068ef4fe46f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:56 +0800
Tag:    v2.3.2

Merge branch 'MDL-33624-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit f1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:50:48 +0800
Tag:    v2.2.5

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

commit ad882e0e4191e8dee5f0a3bbdd7e1b53bf6e226e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 09:44:58 +0800
Tag:    v2.4.0-beta

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

commit 4208d297491ce01ee2daae6184fd3d28b4e0489b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 08:05:34 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34214_dndupload_preview_element' of git://github.com/davosmith/moodle

commit 5d827a7125a6b43c321df992f5b3455fa7a273f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:48 +0800
Tag:    v2.4.0-beta

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

commit ac98ad6189d4da78bd738c69f3cdcd4a15dbf3a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:35 +0800
Tag:    v2.3.2

Merge branch 'MDL-26145_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit 3c0d5ff61e1fa2aff35e0ea125bd896234e4115e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:57:25 +0800
Tag:    v2.2.5

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

commit 78f15d33bb45c5f73d82daf1e6bc02b04f635617
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:35 +0800
Tag:    v2.4.0-beta

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

commit 8f87d57c471596f6eac06a404987017b2f96ed75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:23 +0800
Tag:    v2.3.2

Merge branch 'MDL-28155_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE

commit a9fb701ad52d7640e5ec68825704b9b3eaee74c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:50:13 +0800
Tag:    v2.2.5

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

commit 2ec3484dbe2f89691402c35b5dd6a95e74ea386d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:01:09 +0800
Tag:    v2.4.0-beta

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

commit 828a42c37d7c5a623975e91b3d5a048b0f5a8979
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:57 +0800
Tag:    v2.3.2

Merge branch 'MDL-32310-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit aa83dea5e81860276188223c56a50bab5d17fb72
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 07:00:49 +0800
Tag:    v2.2.5

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

commit 0cc403cbe6138f3122ec15aa910c6c7617c525a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:49:57 +0800
Tag:    v2.2.5

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

commit 7bac687d55a3e41b99d586aeda65a45d1197c742
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:44:11 +0800
Tag:    v2.4.0-beta

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

commit d479ce3bef1b3596c2b220970cc9a5c5da5ce462
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:44:01 +0800
Tag:    v2.3.2

Merge branch 'MDL-34153-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit b0965de5883f374e4ab0e7a418d60206c00cf273
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:37:53 +0800
Tag:    v2.4.0-beta

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

commit f30998190f81c4555ee11da98dc4306ee491401f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:37:42 +0800
Tag:    v2.3.2

Merge branch 'MDL-34240-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit cbbdc7db2ae2f8d724ebb8f48a08bb730a986a76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:35:34 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32228_add_plagiarism_api_support_to_online_assignment_type' of git://github.com/kanikagoyal/moodle

commit c9f6b1af5d232bd2d4b276b06fd62b0d8423de42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:25:36 +0800
Tag:    v2.4.0-beta

Merge branch 'master_MDL-32229_add_plagiarism_api_support_to_forum' of git://github.com/kanikagoyal/moodle

commit ff8ab720f05d48af3ddaacd51ed34ab86ebe06b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 06:10:54 +0800
Tag:    v2.3.2

Merge branch 'MDL-34072' of git://github.com/appalachianstate/moodle into MOODLE_23_STABLE

commit c6e94095be03da8e464ab889f95af0e4cc5051f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:57:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34258' of git://github.com/netspotau/moodle-mod_assign

commit 5c4907e987826c16b85b510f5e2afa155c076419
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:39:22 +0800
Tag:    v2.4.0-beta

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

commit 5b5745daa3285bbf9e3abb80c31667b89db8fd64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:35:24 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33841-master' of https://github.com/barbararamiro/moodle

commit 11f8318ccc8ff1d1176b3821ff391a2763d8cc83
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:25:21 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33874-master-1' of git://git.luns.net.uk/moodle

commit 8fcf6d22bd6b51742c2bcb36426a3ef5fbeb0b9a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:56 +0800
Tag:    v2.4.0-beta

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

commit bac907035929bb49d7ffe9050a898c0c621d2f89
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:46 +0800
Tag:    v2.3.2

Merge branch 'MDL-33788b-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

commit 9f55156eb484e52710479b19eb94616947ee1394
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Jul 2012 05:18:36 +0800
Tag:    v2.2.5

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

commit f163de5a8ccb9058f3286b4956332626b3cd7e75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 12 Jul 2012 14:24:36 +0800
Tag:    v2.2.5

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

commit 37038fa8e1e57576727b89634c593a1493954e5b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Jul 2012 07:33:02 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle

commit ee2b82d8cb8bd8a92077d6123f91c504c45602c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 11 Jul 2012 07:27:48 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle

commit f0d6e53c11ae1b568c14129e5633c6b2e9e43db9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:47:33 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle

commit e9c614276bb16447eb3a8c50f4a8b25aef61ff82
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:26:58 +0800
Tag:    v2.4.0-beta

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

commit af0c360f48b4777d900a23816237a1e755ac944b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 11:07:47 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle

commit e977b391b7a2e74ff83ddf2f142b1e18a6f54adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 10:50:40 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle

commit 8f19a9430451f49cb1509d6d17af2f73d4e747a6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 10:42:28 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle

commit 2e87278cbd6c2da54e09faf68c5e9c62da341eb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:51:50 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34155_m24_visibilitydefault' of git://github.com/skodak/moodle

commit 1ef3f066ee3e041d76d53a63ac7658bb0e5f0d75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:43:48 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle

commit 3ca82ed605b69847456b62da482950ee9482ecef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:43:42 +0800
Tag:    v2.3.2

Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 3bfe07a5adc7adf0e3ffc2264bad4219b34fd8d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:27:47 +0800
Tag:    v2.4.0-beta

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

commit 77c3ccccd235623bac3205465d8beab971dceb7b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:22:19 +0800
Tag:    v2.4.0-beta

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

commit 3ea910c83f200f8a204483da74e6af02346c9113
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:16:26 +0800
Tag:    v2.4.0-beta

Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle

commit 5958b17eb0400655b0215d3df8075dfa67f951d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:13:03 +0800
Tag:    v2.4.0-beta

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

commit bd75b67885fa7e0317fed9961f36f9f71a6b7be3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:26 +0800
Tag:    v2.3.2

Merge branch 'MDL-29470-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 714f2d590a322cb1d4d84c0d1d6d085f14000af4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:14 +0800
Tag:    v2.2.5

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

commit c54cd379ac317dfa325fbc170f57b6887bad2c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:06 +0800
Tag:    v2.1.8

Merge branch 'MDL-29470-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit 730ff61856b2a64f60c2b3804cdfb2b81507f83d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:42 +0800
Tag:    v2.2.5

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

commit 3936796042e10982e78a2705560b154c378a5770
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:05:33 +0800
Tag:    v2.3.2

Merge branch 'MDL-32297-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 3aed38eb7dde8931f71ec7bda9c3152c27158b81
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:03:00 +0800
Tag:    v2.4.0-beta

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

commit 3b37c5ceb9fc2d2ccd14b6be767fa86b1b2ad6c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:47:20 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle

commit 0f36bce51edc366730e813521673144382da69b4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:40:18 +0800
Tag:    v2.4.0-beta

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

commit 68a5f9c7ab4915d6a5a2997ec12034e0b3aff443
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 07:32:09 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27800-23' of https://github.com/mackensen/moodle

commit 357f4d8ed7dabbaa34b86bd9573203dd40b69b6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:24:13 +0800
Tag:    v2.4.0-beta

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

commit 0e08cd1ffd4b390f457cb7903297a63c079ba5fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:19:19 +0800
Tag:    v2.4.0-beta

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

commit 3c34f3213f97348d1332ef2379614bad84fd6b13
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 13:14:08 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle

commit 46bc0e2238349dc58d8f88e1055eee0c2e0f3dc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 12:27:30 +0800
Tag:    v2.4.0-beta

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

commit a2a2e7fb4a2cd8bb23eebc72dbb6b4392a86d010
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 12:01:54 +0800
Tag:    v2.4.0-beta

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

commit 871c06e583d03e12d85a59f845303dfb74b13e79
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 07:44:39 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle

commit 5261dab607dca1f9f0da949bf38981c253f49cba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:45:14 +0800
Tag:    v2.4.0-beta

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

commit 9bf1621fbc3e117493d92ac226c897a6d1b7c98f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:45 +0800
Tag:    v2.3.2

Merge branch 'MDL-30816_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit df4066677524729402f73fce9279a92603032c56
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:37 +0800
Tag:    v2.2.5

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

commit 5c89dd5d186f1f0d2d9e49296c4fb7e00d004299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:26 +0800
Tag:    v2.1.8

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

commit 8e7d4f331720566f8d1c62d5459106363295b0e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:24:23 +0800
Tag:    v2.2.5

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

commit ece157e42625eece5cdcd5af66c08344e885e0fe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:22:06 +0800
Tag:    v2.4.0-beta

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

commit 67fb1b666e10af499a6b5b4d0178397857a02adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:21:47 +0800
Tag:    v2.1.8

Merge branch 'MDL-33514-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 91448b9db20a22371539be017aae011f7d6a1e0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:19:50 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-31033_message_deprecated' of git://github.com/andyjdavis/moodle

commit 6ff9f8404cabe6e830bd5e7bc252aa53ba058b41
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:50:41 +0800
Tag:    v2.4.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

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

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

commit 0ac34abbfbdc1847c9121bae3b3efd675072bafe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:24 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 453e17a1595da026eeafcae2a63ab02a85cfbee7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:47:50 +0800
Tag:    v2.0.10

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 5804a2a31e69e12eae3ccd5a0c76c396ea75c2de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:30:58 +0800
Tag:    v2.4.0-beta

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

commit 6019d2b2f304728e86a3f4e26f9978b48b339129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:15:03 +0800
Tag:    v2.3.1

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

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

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

commit 3778f990ccb0e3e514d5dd698c73294ed690f802
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 06:07:54 +0800
Tag:    v2.4.0-beta

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

commit 74abe5ce15c372e4e4042eaabc48d447609a73f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:54:06 +0800
Tag:    v2.4.0-beta

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

commit 848fc30a2d2835fb1260348715818a475bac5bfb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:51 +0800
Tag:    v2.3.1

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

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

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

commit 7d7f36787bf1bddfd7a0f59a94b41882e31f3583
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:32 +0800
Tag:    v2.1.7

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

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

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

commit dc31e8d73d72f4fe5c74f45694ce5eaaf58873d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:37:38 +0800
Tag:    v2.4.0-beta

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

commit c425663c4c97ad0523335923fc7851712f2799f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:32:45 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2

commit 17a759cf6111484291f3c77e4ae05efdffc17e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:41:26 +0800
Tag:    v2.1.7

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

commit 5439f90aa3f39180550a59a6ccf7337da58a0131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:33:14 +0800
Tag:    v2.4.0-beta

Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle

commit 941d1fb2ccb068d89cc3c6f1b7173ea2bae19d04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:26:14 +0800
Tag:    v2.4.0-beta

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

commit 7df86db31d74401955670dd8cdfa020cfbf2bcf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:26:03 +0800
Tag:    v2.3.1

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

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

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

commit e537a588d8c5a06037f717ae403b9e4040e20df3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 12:35:32 +0800
Tag:    v2.4.0-beta

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

commit 0afd953daf021be08db1ada2c405c95ea76d6b4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 11:15:18 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-34115_m23_arrayofarrayssort' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit 78e43b866b0a8782452d30e42329a264b1dc8bf3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 11:15:07 +0800
Tag:    v2.4.0-beta

Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle

commit 04573eaa650a7cd45352959dcb04746e513abf2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:41 +0800
Tag:    v2.4.0-beta

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

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

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

commit 30cab618e1c51b992b4215fe6191b9ab744277f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:14 +0800
Tag:    v2.1.7

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

commit 73d38068d924f0d3da82e983488dd1b139a9392b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:14:31 +0800
Tag:    v2.4.0-beta

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

commit 10ff22d6f67870c4089a540c1868c57598badfdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:11:40 +0800
Tag:    v2.3.1

Merge branch 'MDL-33987_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 2da0a383980c34fdb6448fb142a1fd90f4a72234
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:48:43 +0800
Tag:    v2.4.0-beta

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

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

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

commit 75aa150051eb95cedde699102d3af1e8c86124a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:47:58 +0800
Tag:    v2.1.7

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

commit e1d7771b0f0c07f3ec039a7e603e1fbdce7dc7c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:36:01 +0800
Tag:    v2.4.0-beta

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

commit 4f5263d969061409c9ab78299715cfaecf747873
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:55:29 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle

commit 14cff7be4d3e2f0e9932db85f32e478804392b68
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:47:07 +0800
Tag:    v2.4.0-beta

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

commit c6c16fd9ea2506113279c746e74b88d8919cfaf2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:41:17 +0800
Tag:    v2.4.0-beta

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

commit b624ae9a2bc7947d342d4fac1a14aa693c7d1f1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:36:57 +0800
Tag:    v2.4.0-beta

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

commit b5c4f3042ba839597b0551fd904c81f850bc7112
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:32:37 +0800
Tag:    v2.4.0-beta

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

commit 457fc727acd13ee86a55c013f74f31e2541528e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:30:30 +0800
Tag:    v2.4.0-beta

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

commit fc8931e4575a59db8403aaf7839d8058eba31cf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:27:16 +0800
Tag:    v2.4.0-beta

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

commit a0c400598ee1ad23b8bca11b7743d0f5c98463be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:20:56 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign

commit a8d40508e9c1a7265bee2e012ab7d4865e39feb1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 06:13:12 +0800
Tag:    v2.4.0-beta

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

commit 30141a875e3fe3608d992ac1df7b9df5455c781e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 05:42:08 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-23254' of git://github.com/nebgor/moodle

commit 103a53473f4b02601dbdc1c35c553e97aa464a76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:53:31 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle

commit e07a3bf209ddcef1d3d1b5cbd598ce845931b314
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33932_master' of git://github.com/grabs/moodle

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

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

commit 40f00ad784d6ca83abd0706bfdc10e2e1f62e017
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:32 +0800
Tag:    v2.1.7

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

commit ba22fd2f1b89afb50ab47d5417a3cf2f8a12851f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:11 +0800
Tag:    v2.0.10

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

commit bbfa552c7b5bacf11cf706183c1de84c3983d836
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:06:14 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-33627_master' of git://github.com/grabs/moodle

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

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

commit 45181b1553aafd9423a40f030eae9dd67b6c8d14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:42 +0800
Tag:    v2.1.7

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

commit b7ab2a33f93bf0374f6aee68fc08880fd097b7c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:25 +0800
Tag:    v2.0.10

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

commit abb98b88815d61fc5e5d5a7e6f7bbd540d5dcc8c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:45 +0800
Tag:    v2.4.0-beta

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

commit 4be710795af8d143074f81111307580288a6770c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:35 +0800
Tag:    v2.3.1

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

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

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

commit e2f3b1eea1a6487c64fdecbe62ab92a6e88fb879
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:10 +0800
Tag:    v2.1.7

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

commit 31ea84a5034731ba5bbaa8aed87b59fcac628f74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 10:40:09 +0800
Tag:    v2.3.0-rc1

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

commit cc0823118decfb4f94aea2265ecfa23c3f2dac93
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 10:25:54 +0800
Tag:    v2.3.0-rc1

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

commit 088c374a6d306f4bbb0ad26c099e29c4be645a23
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 07:56:49 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle

commit a273391e4acac0c4a8458d25ada52e15bfcbd49d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:47:13 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle

commit c691963939655c65eb418e82715eea6c4d3d2197
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:33:25 +0800
Tag:    v2.3.0-rc1

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

commit c5541daf00fc14d7a8a1e16cc318aa0ea4565b40
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 22 Jun 2012 05:02:50 +0800
Tag:    v2.3.0-rc1

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

commit 42fe1f5e073bfce177e732abcd92034e17567db0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:38:45 +0800
Tag:    v2.0.10

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

commit a4c4e43a5f7476ea3c823caa7671d1739c8a8bae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:36:42 +0800
Tag:    v2.1.7

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

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

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

commit d2448b8bd2994c6832d926996a836ead1b318e20
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:25:07 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle

commit 92e084297819a7bd41945aacb0c50e716529372e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:19:05 +0800
Tag:    v2.3.0-rc1

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

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

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

commit d25f6b810490fb3e4b5ba82e80d0fdbb47fea187
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:24 +0800
Tag:    v2.1.7

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

commit 21cb669f36dcdbd094815d69f6c3ff712455276b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:01:49 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle

commit 45d011c896936e843e1f9f3f96b7df9b0f5f9e5f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 05:46:32 +0800
Tag:    v2.3.0-rc1

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

commit f7dc4a56303c983d9dec28475c07abcf5076be57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 07:39:59 +0800
Tag:    v2.3.0-rc1

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

commit 1e3d84785a315d09b1642c45d32b7f807e7868df
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 07:32:04 +0800
Tag:    v2.3.0-rc1

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

commit a9efc8ddb8ac00e0d195c80bb8d07a2e293039aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 06:31:52 +0800
Tag:    v2.3.0-rc1

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

commit ec1ca38996bc1b336cbc35fe43b5ff6b4660ccae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 05:36:22 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign

commit dae0c90dbd443df9fda1d377c489f1eb56fe2dcf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 20 Jun 2012 05:15:48 +0800
Tag:    v2.3.0-rc1

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

commit 778121751d6fa791aebb1a7e9f6bdb02511e21be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 12:37:08 +0800
Tag:    v2.3.0-beta

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

commit 78338b8b0e4eae09fe434223d8db0a67d9a11df8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:31:46 +0800
Tag:    v2.3.0-beta

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

commit 043a53fb25fed46db66b7737f7f8e782de475ad5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:27:37 +0800
Tag:    v2.3.0-beta

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

commit f90848689c40b55b221061ad9ce7170bb0cfbbdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 14 Jun 2012 07:20:16 +0800
Tag:    v2.3.0-beta

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

commit 463ccee1de56e39fadfa56b88fdbd7b9262f4bf7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:40:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle

commit a54a08b818ba46679f148e3bc11f2afc1a784d04
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:32:54 +0800
Tag:    v2.3.0-beta

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

commit 7cbd6d8353f3c9713ac5102cee2e72bc80e92719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 13 Jun 2012 11:24:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle

commit c224cc643b8a03b2245eb2495fbffb7cb51bb9cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 07:53:43 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle

commit 76cc4fd17785117036b68bd71ddde164ecb13895
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:23:16 +0800
Tag:    v2.3.0-beta

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

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

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

commit 5874cc6aabcc2a15a9c4e6db0c4c3b8d82f39c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:43 +0800
Tag:    v2.3.0-beta

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

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

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

commit 54e24c11a59f213c65dfe8d06ee5e9ea76bcc1a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:31 +0800
Tag:    v2.1.7

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

commit a509cb29c30749ec37a329cd08b111b351bf5f1a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 05:04:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30506' of git://github.com/jonof/moodle

commit 5dc4db1ef2596f0779c10dcc714e06d9e3ae218d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:37:43 +0800
Tag:    v2.3.0-beta

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

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

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

commit c2cf907f3f5c58cd0e860dc2c85501724f0d60ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:24:03 +0800
Tag:    v2.1.7

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

commit e5b200cd65c2de2d5101fb766df3a25118fb17e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:19:49 +0800
Tag:    v2.3.0-beta

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

commit f064f0fd15a23f35ce50f2a12d91c9aaf5149a26
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:50:19 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle

commit 9897974b8227d8c4743083484be091fa3bcde6bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:43:47 +0800
Tag:    v2.3.0-beta

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

commit 1236d15b0e9bbd04454b4a0b29100a673843328b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:13:32 +0800
Tag:    v2.3.0-beta

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

commit 4744851197f5e39eadb2cb803261b4edc5f51d55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 07:00:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle

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

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

commit bed0c7a63ef8ed93b8f55095fa0ccb4383a25c39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:34 +0800
Tag:    v2.1.7

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

commit 4c3a1c6f8a6e08d921d91d8ee5592a31d0b2de70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:48 +0800
Tag:    v2.1.7

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

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

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

commit fd200bc5e548f576fc5dcf89dd5ed6720fb34c88
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:33:31 +0800
Tag:    v2.3.0-beta

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

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

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

commit dd9e2c8d444b614ad6823d5b634be5546d8e872b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:18:43 +0800
Tag:    v2.3.0-beta

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

commit 447ebaa90ee7f4437f62f78a550132ebcb9d517b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:14:00 +0800
Tag:    v2.3.0-beta

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

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

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

commit 8ad117cca866e4d3385ddaa211f12cbb96098207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-31823_21' of git://github.com/dmonllao/moodle into MOODLE_21_STABLE

commit 4ed1657f3e983574bc61443b40d8bdfa1c4cc5ab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:10:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle

commit 46d433f7011dcfbeae3c9fcbdd54adbcb83556f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:54 +0800
Tag:    v2.2.4

Merge branch 'MDL-33441-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 7d4c5ac5ab77d729362563576d5b83d5bd0faa4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33441-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit f48de74428dea179464879b47e7c3dece0b065bc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle

commit 928a51ad3d6b3877ca9b38975415e1089263bc60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:06:05 +0800
Tag:    v2.2.4

Merge branch 'MDL-33487-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit ded3134c3766bb7b7f03ac7f52e2caab2b91d000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:05:57 +0800
Tag:    v2.1.7

Merge branch 'MDL-33487-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit e8a20ce85a2a2aaa17fbba65e78f306085d9411c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle

commit 042ae10e1d1ea797d160498e6dbbe566ab981a38
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:17 +0800
Tag:    v2.2.4

Merge branch 'MDL-26277-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE

commit bc1f0e0b405ffc75a96a67b11e429a41c1d34ead
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-26277-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 2c7a72df06244f019bbeac5b424e81da1e848a57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:05:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes

commit b576a97554966b4fd7dd5d135f531eb90caff776
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:54:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle

commit 7df271d9b3541a2ed07010fa11e78a70c3594acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:51:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle

commit 5deaa764ba905ba3ffd3b83f853c223d0c9334e2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 04:30:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle

commit 84ec16a86128efe87a28daeb7f0c9c7cd03b3755
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 01 Jun 2012 09:42:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle

commit 6fbe06e530ed5b27843b99ffb20457db0679411b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 30 May 2012 11:26:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign

commit bd633dda9a7ed63ad427761fe3b64d98d2030eba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 May 2012 04:49:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle

commit bdb315cca269d3672e5dac589451375dd443b6e1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 13:05:10 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle

commit a2aba3f612f24c141e2a4230eebcb0baad0bb5cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 12:50:46 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle

commit d8a05d83b5fa2e6d999c9831b171c1439b33c5bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:56:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle

commit 681789b4c192f8dadecf72f208c8ad14d0534fd6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:52:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle

commit bb0eaec4907f92215e6b5005b81c74a52767cf67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:49:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle

commit 9757d47ebfd99837fda620aa22c1107986032e6b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:07:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle

commit d9ce6f6442d87b91e33048f8f4e5294b382d21af
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 10:03:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle

commit 48cb6e0b1cd521cbfaf568fbe46950fa95e9aa08
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33364' of git://github.com/stronk7/moodle

commit 5a3f6eb468de6a4c27daecc10693bdf5e3fd77e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:09 +0800
Tag:    v2.2.4

Merge branch 'MDL-33364_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE

commit 27ee2b673775dc736f87c2974b2d286a0e726c76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:01 +0800
Tag:    v2.1.7

Merge branch 'MDL-33364_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit a09a9be81210a29a0c093ff34dc5685c86b84022
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:37:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle

commit e5d6cd54616007b5593f7833b001fd51fa94136c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:18 +0800
Tag:    v2.2.4

Merge branch 'MDL-27675_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 9c96488ed967a5923fd082ab9b30cab9409f99ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-27675_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 08e0aaa1733489cee61b1c48e166a98ada4477cb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:22:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle

commit dcd5d0840bc288e09b60225bb5d7e57805518640
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:58 +0800
Tag:    v2.2.4

Merge branch 'MDL-33191_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit b22884274f8e7729c5a9145b3b355fb1d4b03527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33191_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit c31081d0a46d4c8a89d61dc99a6f47d994e2f3ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:19:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle

commit c994797ea9d6f03d535ebc50e2fbe2608661b371
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:12:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33120' of git://github.com/stronk7/moodle

commit 63f2813497ef91762976208a06bc23f0888ff02a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:04:43 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle

commit 7824c9d820b0e080a4069626068af7683875bd0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle

commit d48f4d2f75eebe5ce235b5cdeaa2983ccd7a44c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:12 +0800
Tag:    v2.2.4

Merge branch 'MDL-33325-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit ab833c6ee4634cf67bd688eeb7780267c58cf013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:03 +0800
Tag:    v2.1.7

Merge branch 'MDL-33325-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 3d1e457e3e69961942fcbb4bdc69e4be886415e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:48:40 +0800
Tag:    v2.2.4

Merge branch 'MDL-32203c-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE

commit cd7963eabd5fed361f5ffc03d77f7c61fd522935
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:42:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle

commit ebbf509960fcb0c53d2b39d2fae551d2711c5c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:23:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-32203c-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit 8dd37f1f6986ccd3521fa0f2467555539620e3aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:11:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle

commit 119e228621d7cb3d7a817599fba6089b3d99133b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:00:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle

commit 05ceae9bb2e12dbf52d210b299bbd9f38e3c3bd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:16 +0800
Tag:    v2.2.4

Merge branch 'MDL-26562-22' of git://github.com/vadimonus/moodle into MOODLE_22_STABLE

commit e09266d176f1af06d2614333c957f68e77750c7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:06 +0800
Tag:    v2.1.7

Merge branch 'MDL-26562-21' of git://github.com/vadimonus/moodle into MOODLE_21_STABLE

commit cba59b3d832fc7af00bf41a4d1eff8ae7c64bd4d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle

commit 3e11be405b25ebef9fab1413634a5f76dc21f902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:23 +0800
Tag:    v2.2.4

Merge branch 'MDL-32204-mnet-auth_22' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit d7bce7db814d03a326128c4174b94468382a7e64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-32204-mnet-auth_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 0b02faa076803e40613788396202691afcc94c6a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:40:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle

commit 4f4476081f1de47d4f991e95921350b0cd595de3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:31:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle

commit c5b8ae0eb7ffa63bbf661684491f2ddeefde01b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:21:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign

commit ad5d189c93337da12cdf3a8c9c7c1ee0b98233ca
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 07:38:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle

commit 4c32b79957884e468d4e1e7f5917120a3e140acf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 06:54:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33122-master' of git://github.com/ankitagarwal/moodle

commit 25bea62d331cc1acbcc4a9040a5425a0877c694d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 06:49:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33137-master-2' of git://git.luns.net.uk/moodle

commit d5e6fe3ecc99321f743be2d62a9acf888a9130f4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 18 May 2012 12:07:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32727' of git://github.com/timhunt/moodle

commit 67cfce024524c0f7635466edb88d85b781fa6b42
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 18 May 2012 06:48:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle

commit 2bdafb867a130b989899dd424578c921f767bfc3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:55:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle

commit b9453253390af24dcd4f8c56daa6869b0cb7f83e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:49:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle

commit e76f4039b98a1c7697443e5bc1e4a4e9dad58036
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:42:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-29399_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 72f19573931c9a2e7969d351021706a1b321b7cf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:24:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign

commit 1220843c0230746acee87f0a32abdf671b19fc64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:30:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle

commit bcc52e748ab69c77b7b516352f4fc774e78e707c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:50 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle

commit 843599ae8611fd3d512002a2aa38c4956834ff6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:37 +0800
Tag:    v2.2.4

Merge branch 'm22_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 2dfeb89f48fc68c241033a024aafabdc111f42b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:17 +0800
Tag:    v2.1.7

Merge branch 'm21_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 536e3203e71650739af672f210fa1bb14ebb4faa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 07:54:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign

commit 333127136a980a999c12a1e024abc8c72e6d72b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 07:53:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle

commit 7b06151288072f0b9e6f02af5935ca54add0aa30
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 06:55:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle

commit 19d1525f6b4065824b3e48479e33cf407bc16f94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 09:14:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle

commit ba94f1d503cf306d88b8f4a7b73aeae6def4df0d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 09:09:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle

commit a5bf3c520fda24b3e4cd5f7819dd064fcca870ee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:59:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle

commit fdbd219b33d7364feaaf8b830be553898ee0c8be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:51:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle

commit 3cb5b9ccf6293992f5714093309b95c880901688
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle

commit f97184b9c9ad1ced09047a8344c451b18753309c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:12:06 +0800
Tag:    v2.2.4

Merge branch 'MDL-31458-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 25f8be6e70b4f35a7d1c69afd3ddce2ee0ea547a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:11:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-31458-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit dfb597b447e0061776a6ddb7ec017daf4400636d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 11:36:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle

commit 86558590a46d854852b47bb6517c4183c220d078
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:52:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle

commit edd25271c4c852fe05170354f03cda018468a65c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:48:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle

commit f98a3833b975d82faa8ffdbe187dd58578f60244
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:37:51 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle

commit 04d7103804545ea14f99ebfb590634b50eaec996
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 10:04:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle

commit 1c0441bd6a770ef29ee24f984006cc41bf7c8a7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:39:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle

commit 8ec7c2cfd98c55d9733ee8929148e199fa7b54ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:30:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle

commit c96e613c66b00fc7e3bd31e2a5430a9e9145afdf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 May 2012 09:20:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle

commit f818719f117a6a0c0c40dc00e4f93700225fc3be
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:28 +0800
Tag:    v2.2.3

Merge branch 'wip-MDL-31763-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

commit 9c0f9c588e64005a0b61553aeb69022fcf0d4f1c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 11:14:19 +0800
Tag:    v2.1.6

Merge branch 'wip-MDL-31763-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 5ba2e3150fc7e6ee6c4921cdc320d5c7f37f148e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 10:11:24 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle

commit 3c611a360e754bdb2c83a87a6cffc859e16a7079
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 10:04:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign

commit 137467f5b4edbb7e87d5606325ae898adb790255
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 09:58:12 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle

commit 6bfa88103dfa9b01859b162cc169ab6f04a28acc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 09:52:31 +0800
Tag:    v2.3.0-beta

Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle

commit 78ed2ec79f101c5df48f5386812f1e9dbd945ddb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 08:15:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32857' of git://github.com/danpoltawski/moodle

commit 60301632b9f5dd8aedacb0de8b91b2357f4f3e1f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 08:00:54 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle

commit 320b4deb6ab195276e047633ad0f64409aa6b25c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 10 May 2012 07:56:58 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle

commit 93af314f7895cf413ea3b63bd5e423b1c6f68c84
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:45:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32164-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit a1f173f7743c78bf882a339fb996b366a1ee10bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-18095-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 4997ac9e2ff571a71fdc640544b01d7d7b262041
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 09 May 2012 07:31:24 +0800
Tag:    v2.1.6

Merge branch 'MDL-18095-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit f4e4ac8c59c7767ded9e3b26755225a758d0245c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32670_22' of git://github.com/rlorenzo/moodle into MOODLE_22_STABLE

commit f44480ccccb372cab987c5b5753220a7d86a3875
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 14:06:43 +0800
Tag:    v2.1.6

Merge branch 'MDL-32670_21' of git://github.com/rlorenzo/moodle into MOODLE_21_STABLE

commit 329920fa2260d8a7ba1326ecdbc8725f3d97ebf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-31671-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 8296031c1f1b2e0b08b05f0f07240da3ad9b979e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 May 2012 13:41:44 +0800
Tag:    v2.1.6

Merge branch 'MDL-31671-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit ab45e3b491ba5e2a784d14ebf649259726c12fb0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:52:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle

commit b702373a4d2bc0d232df81fabbb858cb00ee50c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:51:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-31762-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 1470c0f46e116f7b4c6f00858bd5695d2145fd49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 13:44:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle

commit 398e6932b0df5f3f9f729753d4454c6957c9f79b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 10:41:11 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle

commit fe9693df87681b9f7a9bdb804f2dbe6cf89945ec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 07:48:24 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle

commit a6d2cf82dcd7abb6880cd19b41dac5e93a74a5f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 May 2012 06:25:09 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32595_m23_unsignedandlob' of git://github.com/skodak/moodle

commit 7c30505be824d9c8a697ffff25e6f55bf81eeb6c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:43:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle

commit 75c9c54be4501734edfb459e9eb06fa139112d67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:41:37 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle

commit 3a4b0d0bc00113066031d8b1274fc7c8851faa92
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:34:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32607_m23_upgrade2' of git://github.com/skodak/moodle

commit d0eeb25a6478c630f744ddcfa68230cbcc471fdd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:33:53 +0800
Tag:    v2.2.3

Merge branch 'w18_MDL-32607_m22_upgrade2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 46847c220cbc84081b5525195a4249749bf8a41f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:29:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32612_m23_debug' of git://github.com/skodak/moodle

commit 4bbefa1c19e7a23fbd9e081e9f9ec0ccbe7cb456
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:26:53 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32640_m23_forumstrict' of git://github.com/skodak/moodle

commit ea7cc40eda09fe50cbb846a154dc34690201d45b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28955_master' of git://github.com/lazydaisy/moodle

commit 0ee1c3db00e17e89e81f390232ddf6c4883358e9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:17:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28955_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit ba5f2ec6639db3ed834756b03e004858d1cdfa34
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 09:16:54 +0800
Tag:    v2.1.6

Merge branch 'MDL-28955_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2dcc93644f7637386cd4ec4d0b19e39c72cd7320
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle

commit fc3a00dc64447eb71e5f74b382e3a581c50b4d90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:42 +0800
Tag:    v2.2.3

Merge branch 'MDL-32012_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 7299a9e288909b8fd773da888a5f6388a89af87f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 08:37:21 +0800
Tag:    v2.1.6

Merge branch 'MDL-32012_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit 1ad903ea8b034487ee1f19897c568ffd5b668e8e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29264_zindex' of git://github.com/andyjdavis/moodle

commit 44835cdc8b9676ca1f328d6533d29040d3a6d028
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:48 +0800
Tag:    v2.2.3

Merge branch 'MDL-29264_zindex_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 817d9328aeee2e2ae0f40a6e13cf9d38f306e1ac
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 May 2012 04:23:45 +0800
Tag:    v2.1.6

Merge branch 'MDL-29264_zindex_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit 21f7b01d19eac3450c89aba064130c48db7fa6dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:26:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle

commit ac3f3571a5505aec2afc88a1a1e1fc0dc0cee77e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:54 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle

commit 3464845868243a5a9d37af18f3a475c57fe38297
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:49 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32597' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit d8317f0a40489d9922a257c2e97f0f2f4103c8c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:21:45 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32597' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit cc2ae468d234cf98aaa93e360eec53b15e979ac6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:19:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle

commit 390c3bc54a16f1e427d2813e8ed290273cb9cedd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:15:03 +0800
Tag:    v2.2.3

Merge branch 'MDL-28735-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit dd3dc2e2e3822d300a9c899a06a1b0f114171fed
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 09:14:54 +0800
Tag:    v2.1.6

Merge branch 'MDL-28735-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 6caa86747f4a5c67ecc4d7e1ad9231e8b0c0b830
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:50:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle

commit 446326ab67d847b14fa3d5286280e671dea934c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle

commit ead5f3793b1e1ba20ccb85c422b56b32998fc73e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-26523_grader_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit dd6776c92b8c08d1e59a3e3b129bd3b38713f380
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:46:28 +0800
Tag:    v2.1.6

Merge branch 'MDL-26523_grader_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b5907a8674c7a56358346084509204944e2ab018
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:40 +0800
Tag:    v2.2.3

Merge branch 'MDL-31429_paypal_messages_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3d173c1d38283695bce1d071be7790aea19a748a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:33:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle

commit fd8335c90e35f0f2842c3bb98b9045eaf754edc5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:26:07 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle

commit bc0be2fb800e963528a36fc62406f450e4109719
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:16:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle

commit e074f9763b7cca8b1eacbe1de6ff6f32ae4d13f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle

commit 8a8f68ff976e8059f14d14713f3f519e91f447f5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-31510_group_activities_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 60aaa96f61b782ba5ccf7cccd85fa31e18e06002
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:11:05 +0800
Tag:    v2.1.6

Merge branch 'MDL-31510_group_activities_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b5aa51419abf65004973e5083f667ffa171a7518
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:03:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle

commit b969338742d41c268226d7ef99c7c9f3b06eb131
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:50 +0800
Tag:    v2.2.3

Merge branch 'MDL-32238-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 8374754563129da8dddb6b1bbe9eac5875053c50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 08:02:42 +0800
Tag:    v2.1.6

Merge branch 'MDL-32238-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit c547c7c784b1f630d7519658f196c75b7b88beee
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle

commit ba69b6952a9dfc5d9af231506ccb45d097841d77
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-32624_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 45bfe330eaccdb3eb39b4d22e6475f0f556dc1d5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 30 Apr 2012 07:57:18 +0800
Tag:    v2.1.6

Merge branch 'MDL-32624_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 6669669fdb125921d6972979506e4c51532d7e2a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29174-master' of git://github.com/raymanuk/moodle

commit 5335b7deb828d5ce79e2a1bfe9fa020eb17924c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:37:04 +0800
Tag:    v2.2.3

Merge branch 'MDL-29174_MOODLE_22' of git://github.com/raymanuk/moodle into MOODLE_22_STABLE

commit a02e2eafa441ca8d3fdd2eb4174f98a5096d236d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:31:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle

commit 9f31cf9f33b2469840563dbbfb9d660f268b8476
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:25:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32447_m23_tcpdf' of git://github.com/skodak/moodle

commit fa3671d49ff4b6d969bc125110d17c96c5440420
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32385_master' of git://github.com/lazydaisy/moodle

commit 80bc3d98800e86aec55917e41f16a3dd1b1c558b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:09 +0800
Tag:    v2.2.3

Merge branch 'MDL-32385_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit b83306c0ce65aaf3c19e8557640a4d32a07b794f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 13:06:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-32385_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 52bb02020d45abf3b11611ba3bc04a862221dcf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32444_master' of git://github.com/lazydaisy/moodle

commit 4a979297aa389604b95f28a98ada4038065e4f3d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:38 +0800
Tag:    v2.2.3

Merge branch 'MDL-32444_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit f2994d7338586b4451197974311316380b4f1262
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:59:24 +0800
Tag:    v2.1.6

Merge branch 'MDL-32444_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit cb4b46f45c197961fc199648f914af47b738cbd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:14:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle

commit 11990142b0fddba131b7cd1e781c4c3da12c3c67
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:11:59 +0800
Tag:    v2.2.3

Merge branch 'MDL-32353_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit f0c351f7632f9cbff4026781d7a0bc59a221ddab
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:09:21 +0800
Tag:    v2.1.6

Merge branch 'MDL-32353_m21' of git://github.com/merrill-oakland/moodle into MOODLE_21_STABLE

commit e3d34313ab95b1ea1157906fc636980219a39a9e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 11:00:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle

commit 448cebee57b0e504bdbb4ffb619d98d863899213
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:23 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32388' of git://github.com/danmarsden/moodle

commit 0656d45fbcdbcfa23515480f18ddea8b656604d1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:10 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 50ff77d26a68250865776d42c71a3be3760d0572
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:23:02 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 96d8c696ce7a192962ac1c59a0421d56b05af9c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:22:50 +0800
Tag:    v1.9.18

Merge branch 'm19_MDL-32388' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit d8b09e5eb2269468f8c0ef31fb970639935f3bf6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 08:00:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32356_master' of git://github.com/kordan/moodle

commit 885d20828354cfb30729f76ea32a79e34ef14ebb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:58:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32433_master' of git://github.com/kordan/moodle

commit e3a660a2e7a83fc8765aee70e4f207335d6d920e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:52:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle

commit f295ffebd0472e8a7a0d9e133beca6b3647acb6d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30819_grader_col_highlight' of git://github.com/andyjdavis/moodle

commit 98a4be51768976022a63876ea40b60d09695ee49
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:36 +0800
Tag:    v2.2.3

Merge branch 'MDL-30819_grader_col_highlight_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 0eeb0874cc29c1f3dace37c5de652ef9f9cb9c97
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:45:29 +0800
Tag:    v2.1.6

Merge branch 'MDL-30819_grader_col_highlight_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit be58371e4e55750ecc94cfae40364da957d39de9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30955_forum_ratings' of git://github.com/andyjdavis/moodle

commit 77b300ca5184d283f9d9c2b5dacdd5d9b44644f8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:26 +0800
Tag:    v2.2.3

Merge branch 'MDL-30955_forum_ratings_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 6535721cebaec187dfc968eecfe2bfc528aeb686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:34:18 +0800
Tag:    v2.1.6

Merge branch 'MDL-30955_forum_ratings_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

commit b9afb90b7fe7fd29aed95ac4752e30128b668ee1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle

commit cb36e6ba4ab9e130c0d4d73003bd05551839b4ba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:25 +0800
Tag:    v2.2.3

Merge branch 'MDL-32316_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit a38d62efd8f8a336d8b0b7252f2dfc3c54d912a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 07:00:16 +0800
Tag:    v2.1.6

Merge branch 'MDL-32316_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 68c7673088397d9334f6fbec463e4603f6ab6450
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:48:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27547' of git://github.com/mouneyrac/moodle

commit b182c1238ef4d42e8bad2539089aa7cc35be21c6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:47:58 +0800
Tag:    v2.2.3

Merge branch 'MDL-27547-MOODLE_22_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_22_STABLE

commit 84aabeae85aee8e6c6cad12601146c6b9b249761
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 16 Apr 2012 06:46:37 +0800
Tag:    v2.1.6

Merge branch 'MDL-27547-MOODLE_21_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 9f8662a52825da27b3a3a3f5e20ca23381f282c2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:21:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32124_master_wip' of git://github.com/grabs/moodle

commit ec01a02d8b8092c3ae782f2b53ad4edd6dd02af8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:57 +0800
Tag:    v2.2.3

Merge branch 'MDL-32124_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE

commit 365e69b47dfb11c81d9ec6a1aa8118382df70529
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 13:11:49 +0800
Tag:    v2.1.6

Merge branch 'MDL-32124_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 0ccb4dcce099781938a3e8ca8efda4168e3eed80
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 08:38:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32349-master' of git://github.com/sammarshallou/moodle

commit 5bfeb5ffd39f2b0c73c9b6cb679949a71936ef7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 08:34:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

commit b054ead121779a944a3d59668a2949c7cb182f2c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:37 +0800
Tag:    v2.2.3

Merge branch 'MDL-30843_b_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE

commit ea7170945cdafbc732c3beefb45f613ab7b8c7c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 07:01:27 +0800
Tag:    v2.1.6

Merge branch 'MDL-30843_b_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE

commit 859a181627ba3afb8da2a3f1c2bdac4d83b360d2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:34 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle

commit 3f046db1501da3b9b047cb3b3e8fb5c59aff8096
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:19 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32270-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 56e270e11ed5ae2dfb01ea6814beca982f2e9b1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:53:12 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-32270-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit aef4aafa0b3f46b587a1e19afd9e7c92b9dfc08c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:34 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle

commit d9cc6b7a31cb95bd8f68b8fe3e5007541827e21b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:48:15 +0800
Tag:    v2.2.3

Merge branch 'w15_MDL-32263_m22_enroladmin' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 93068559b7565f45c411063c642f8ad0a7191dba
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:43:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle

commit 756d5f761050c182d523a1e9fbec39c2449653b8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Apr 2012 06:37:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle

commit f1b06f6d54b45ddedb39567b4015cc493dcfb9d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 10:19:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle

commit cad96a8a365d7d8a86041160d76d32c30fe37f0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:22:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32137-master-1' of git://git.luns.net.uk/moodle

commit 729ef697055379ea51e2e59b5b6bb74817579f85
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Apr 2012 04:21:52 +0800
Tag:    v2.2.3

Merge branch 'MDL-32137-MOODLE_22_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_22_STABLE

commit 7b98a1dfd89f0332d6fe5eaf53b6fe670db1d45c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:33:06 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle

commit f65eadd42db932e9eb63dbd2dda8737f954df9b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:53 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-32150-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 3e14545d2d05c11d678f435d5859697b4a93f7e6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Apr 2012 06:32:33 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-32150-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 530eecc0f900a4b0f53b1891369e75c482703542
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32239' of git://github.com/timhunt/moodle

commit 2de2d0d2cd9e6dffdfa50062b77428d3a361fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-32239_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 6931d5408532aec94af33e261cd0724ebedc0b7c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 10:31:01 +0800
Tag:    v2.1.6

Merge branch 'MDL-32239_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit ea6805f009e33526d1121f5d07bfcaf9c41a5f7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 08:26:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30981' of git://github.com/stronk7/moodle

commit 880a40c5b1262aa8fa200a8b53e8766ed55bbdef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:28:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle

commit 0292c465fe726f36c647b7888e1c99241bf0489f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:27:55 +0800
Tag:    v2.2.3

Merge branch 'MDL-32256-cron-return_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 4958b6f224487df7705166471fe93fac3b95dfc4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle

commit 12376c971f543a69f80acd1f74ba9b59e5e0eb90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:41 +0800
Tag:    v2.2.3

Merge branch 'MDL-32258-data-cron_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE

commit 50cc39f9503b8d08177709a6bc55f5ff3abb8f14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:24:16 +0800
Tag:    v2.1.6

Merge branch 'MDL-32258-data-cron_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit 90ad4ed5897ccbef109550a0de26a049aadb1dfe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 07:19:58 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content' of git://github.com/kanikagoyal/moodle

commit 3279dd42535bfb6d36eb601fc2bef9a91f5931c5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:22:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31711' of git://github.com/nebgor/moodle

commit 6b8e99dd87d8ab6c37cebb458ad12606e17dd225
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle

commit fc0acdfacda1a5e5e7444101aa7898c1c752b9a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:16:20 +0800
Tag:    v2.2.3

Merge branch 'MDL-32289_M22' of git://github.com/lazydaisy/moodle into MOODLE_22_STABLE

commit c185ac18f59170f7cf08217f45fa64d1de0dbcbe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Apr 2012 06:15:41 +0800
Tag:    v2.1.6

Merge branch 'MDL-32289_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit a7cd1f5a53ee7b3fe5a3f2b203e6a980632531c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle

commit ec202ddbbab08e8f219de04671215499af16864d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:03:08 +0800
Tag:    v2.2.3

Merge branch 'MDL-22510-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit c4d72072dc0e074e63c67aa1bf23d9a2ab4245fc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 06:02:53 +0800
Tag:    v2.1.6

Merge branch 'MDL-22510-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit 5dc1a544ea620692600904bf5a378e6bdfd9c2ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 05:05:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle

commit c1949252789fe1618e0e40fdd138ef6b1681d29b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:40 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle

commit 015c334a7303be4d0c9cf465efc6c0524a26a71b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:51:28 +0800
Tag:    v2.2.3

Merge branch 'm22_MDL-32147' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit 88ead1b9ff452ae08583a52ddc6f8d30483da7f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 27 Mar 2012 04:50:19 +0800
Tag:    v2.1.6

Merge branch 'm21_MDL-32147' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 9491f60e442d4ec0470e9356cec030313065795c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 07:01:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle

commit 3e17de5eaddaf2c2184442c25caee8d0ecdb9402
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:39 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle

commit 2733a8c4d592f56058a155fd473bb8807c28c25a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:29 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-29331-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 8a4aa94daf2232fe13e3c086b56172e8e4affac7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:57:20 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-29331-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit abdbeec6bb873b6deb8e434a04f6d228ac819475
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:19:27 +0800
Tag:    v2.2.3

Merge branch 'MDL-29400' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

commit 991b3a3a9bd93c36dbdf131b436e506535b6d4cd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:13:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle

commit ef288bd4d382737f2629541082dc677518cfe9b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 06:06:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32027-master-1' of git://git.luns.net.uk/moodle

commit 75e5bd51ea572dbfa054443cc88b425325f28902
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 05:35:48 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle

commit 0a5bc5dd470e851d4e6ca210f6cf003e55c9fadb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 Mar 2012 05:31:36 +0800
Tag:    v2.3.0-beta

Merge branch 'w13_MDL-32029_m23_extdb' of git://github.com/skodak/moodle

commit 117bd705f3f694a920e5afd265e8a84412da8d3e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:57 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 292f509cfff0ef8d7c0a8d9734f7c71db14bfb1d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:11:03 +0800
Tag:    v2.2.3

Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE

commit 0982968a37e89fb91d060236509507dd0eceef36
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:10:44 +0800
Tag:    v2.1.6

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 657db60a9929769102846d4686c982ba58d120b5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 23 Mar 2012 07:10:14 +0800
Tag:    v2.0.9

Merge branch 'install_20_STABLE' of git://github.com/amosbot/moodle into MOODLE_20_STABLE

commit 3222f6eca1e7a55c3fd4fa68d738f5a1224ba4dc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 22 Mar 2012 05:44:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle

commit a7dedc5efee57f33bdee8194f42f8ab8009d0039
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:20 +0800
Tag:    v2.1.6

Merge branch 'wip-mdl-31640-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit 89399cb129f8e5aa677352b911a69a7c521c9d64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:50:13 +0800
Tag:    v2.2.3

Merge branch 'wip-mdl-31640-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 1a381535e6caf2755afd9462ccb5d250fa06384a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:41:32 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle

commit 333b9ac765c6b896f268dd081fba5525bd01375f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle

commit 0d2001b756190b31ab4d73affc234e0fce633865
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:12 +0800
Tag:    v2.2.3

Merge branch 'MDL-28952-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

commit 7ad20028b0cb3417320e0560507a3fe33156d38f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:29:03 +0800
Tag:    v2.1.6

Merge branch 'MDL-28952-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit bc4340ca9cd2723ba212064c396af6cdf3c3ae21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:24:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle

commit e5f9484e46c6edce4d4ad4edf9caba1802e40747
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:24:38 +0800
Tag:    v2.1.6

Merge branch 'MDL-32065-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 23dfb50687496c196b4f3ad6d8b950e7731578ef
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 21 Mar 2012 04:20:29 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle

commit ef844d0a156c629bb9a30d9678522b014e8c24c1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 11:47:17 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle

commit 270bdf5265b968f3a45b97fa4c27e72a1ece2308
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 09:04:04 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-11047' of git://github.com/mackensen/moodle

commit dff9c69fa8a5023795ee4c3eeb8c591de847e5db
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 Mar 2012 08:41:20 +0800
Tag:    v2.2.3

Merge branch 'wip-