Git merges in Moodle 2.6.3 by Sam Hemelryk

commit ff6a130dcdb34aaf95406555add67de0fae1ff28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 06:24:23 +0800
Tag:    v2.6.3

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

commit d1b900ea920bd4e13329261daeee4f7df6adac07
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 05:10:12 +0800
Tag:    v2.6.3

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

commit d6eb354664e38767c09407efa50967f5936ba2b0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Apr 2014 04:40:20 +0800
Tag:    v2.6.3

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

commit 5701d152e565816c36ef730fc771dcba56633046
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:29 +0800
Tag:    v2.6.3

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

commit 3638582c2f185920e9988cc2df78fa21dcb05309
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 10:09:21 +0800
Tag:    v2.6.3

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

commit 2f9955d4cce629ade11fa4d289ad57b3e481a0ea
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Apr 2014 08:22:51 +0800
Tag:    v2.6.3

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

commit 291bb582ad70714457f38ee93142c8d22200e9bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:03:22 +0800
Tag:    v2.6.3

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

commit 7b292552ddd63b723c6761dc49948fe7f14d3111
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 Apr 2014 07:01:41 +0800
Tag:    v2.6.3

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

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

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

commit 6049011264397108b105adb83a1c297b249828c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:39:26 +0800
Tag:    v2.6.3

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

commit 96ce0b22d6abbb884a4e69e9711bb04c1a3bfbd3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 06:10:11 +0800
Tag:    v2.6.3

Merge branch 'mdl45012-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

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

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

commit 8a51e2d563bffd582d16e24ba8f71ee213fa8dda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Apr 2014 05:18:28 +0800
Tag:    v2.6.3

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

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

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

commit 1a5748b258205cbf65a97d9430e80b56ece32416
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:52:10 +0800
Tag:    v2.6.3

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

commit d947f5d08f0ec6f1226c783dbe94f18f004383c0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 Apr 2014 04:39:39 +0800
Tag:    v2.6.3

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

commit 5c3c27ac6aef0e4a606fbf1376d935ea90996e17
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 Apr 2014 07:43:59 +0800
Tag:    v2.6.3

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

commit 7e9b7392cad404c15669a58fcf7bbb6f06c03827
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Apr 2014 07:31:01 +0800
Tag:    v2.6.3

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

commit 2a20285c35b3ea9614075233924ebef3fda4a012
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 12:02:56 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-44738' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 333d189d9f572ae89743f2fa4e0ea27f46c5501b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 07 Apr 2014 11:43:15 +0800
Tag:    v2.6.3

Merge branch 'w15_MDL-44882_m26_upgrademaint' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit d7680b1f23ed6338e9dcd350ebedc53c21cd35d9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 08:04:52 +0800
Tag:    v2.6.3

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

commit 15f780a79747965a671a5a87845cb33ac36f4db2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Apr 2014 04:27:07 +0800
Tag:    v2.6.3

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

commit 50fea8055f99e08e8fcd1faaa559f4ba6a39564f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 25 Mar 2014 07:30:47 +0800
Tag:    v2.6.3

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

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

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

commit 7b78b302127042a96153c8f3874ac628456ce67d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:41:07 +0800
Tag:    v2.6.3

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

commit 8b0892d605191876d2fc82ccfd71ca0192968e7f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:36:04 +0800
Tag:    v2.6.3

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

commit a2db21c633a334ba39207e7ad549e77cc233686d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 09:27:08 +0800
Tag:    v2.6.3

Merge branch 'mdl44499-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit 80440a4a66e44430bb69cc3a4a883104fbca84d3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 06:48:34 +0800
Tag:    v2.6.3

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

commit 683b5caa061d7660b559efc7ef45e76977db5b28
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 18 Mar 2014 04:03:31 +0800
Tag:    v2.6.3

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

commit 390188606e74170ac19b1e45857abaff4f820684
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 09:13:14 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-37733' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 559834f786b594c664841e9235103d8c60a2cc65
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Mar 2014 06:57:01 +0800
Tag:    v2.6.3

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

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

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

commit 509f37138912485520fc8df8887d6989ceb5f0a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 09:22:41 +0800
Tag:    v2.6.3

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

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

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

commit 5caac6a49433369fae4f58b3fbd684cf4d4a692d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 05:10:28 +0800
Tag:    v2.6.3

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

commit 6b347521e31496b744feb5533ec4679991fc2701
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:54:39 +0800
Tag:    v2.6.3

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

commit 2f5288dea029bfd440cb7e747707aae28c9d3a69
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Mar 2014 03:46:11 +0800
Tag:    v2.6.3

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