Git merges in Moodle 2.3.8 by Sam Hemelryk

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