Git merges in Moodle 2.6.2 by Sam Hemelryk

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