Git merges in Moodle 2.4.5 by Sam Hemelryk

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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