Git merges in Moodle 2.6.5 by Sam Hemelryk

commit 23bf420120018a9892f308a848c1b4e4b35e1e90
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:51:03 +0800
Tag:    v2.6.5

Merge branch 'MDL-43908-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE

commit 5175bb487ef249bc579c6a085a25a3dfa13030a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 11:47:18 +0800
Tag:    v2.6.5

Merge branch 'MDL-45041_26_STABLE' of git://github.com/jleyva/moodle into MOODLE_26_STABLE

commit 98311522edaed6f45b6cf9649b8cd82b7dd1bf61
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 29 Jul 2014 04:46:55 +0800
Tag:    v2.6.5

Merge branch 'MDL-45044-m26-master' of https://github.com/dthies/moodle into MOODLE_26_STABLE

commit 33906441562aade04dcca102010e1130b86aed54
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:22:45 +0800
Tag:    v2.6.5

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

commit fcb1e8a9c25e1660e60b0f26e7d61bcfda7eca44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 08:13:48 +0800
Tag:    v2.6.5

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

commit cedd791b193c4b5d1f89d6b5cd56c93a7d6fe6aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Jul 2014 04:46:07 +0800
Tag:    v2.6.5

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

commit 9e32e3befcef51be950282c24c03174986b14005
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 07:12:13 +0800
Tag:    v2.6.5

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

commit 695553b1a5dae515c0577c62d45a239aef63ee63
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 Jul 2014 05:49:07 +0800
Tag:    v2.6.5

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

commit e8b0dadd6b172bb403d09546df3238d21b6d5293
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:35:50 +0800
Tag:    v2.6.5

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

commit 2e8d176e271505aeee28280a66d54e2dd047d30f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 07:12:08 +0800
Tag:    v2.6.5

Merge branch 'mdl-46427-m26' of git://github.com/deraadt/moodle into MOODLE_26_STABLE

commit 997be8cd2dbf53a2b297c2538ef449b2d4962734
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:49:29 +0800
Tag:    v2.6.5

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

commit 6958e7ebb03d48b85d6ef4fd81ed8535b01475b7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:45:38 +0800
Tag:    v2.6.5

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

commit a3f41f58404864059ea5f24842fee0e04022978d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Jul 2014 06:42:35 +0800
Tag:    v2.6.5

Merge branch 'wip-mdl-46372-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit 522cbb467c26b2f2ca317cb02b61609d0be04b2e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 15 Jul 2014 04:41:46 +0800
Tag:    v2.6.5

Merge branch 'MDL-42179-003-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE

commit 85cd13b837d4de894da9ec5a06ad0b31c1383bd8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:28:01 +0800
Tag:    v2.6.5

Merge branch 'MDL-42214_popup_blocked_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit ff12f87c6276fdc1fed97ab0b0f0cbb21ad6db7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 11:16:11 +0800
Tag:    v2.6.5

Merge branch 'MDL-46073_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit 4a8103d97b89f4495b27680ad0f4262ce47ae8c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 08:10:03 +0800
Tag:    v2.6.5

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

commit 571516003b255408cb6c79bbc5052e13096ba46b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 06:32:53 +0800
Tag:    v2.6.5

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

commit cfaf9dc5a74a42af28552f3cc51f836ea019c50b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 05:51:27 +0800
Tag:    v2.6.5

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

commit 23dab427de7b2d8d0777051b94565215873534a8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Jul 2014 04:41:53 +0800
Tag:    v2.6.5

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