Git merges in Moodle 2.6.4 by Sam Hemelryk

commit 20c80d9e2f436f93636aad43bd3fd34e052a1835
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:40:17 +0800
Tag:    v2.6.4

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

commit fc22f80e9c734d06c1b687361c9ad86848bfb5a5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 10:27:55 +0800
Tag:    v2.6.4

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

commit fadff0062aee6aa7dc7bdae8aa2ff4ed2d0053f3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:53:47 +0800
Tag:    v2.6.4

Merge branch 'MDL-19270_moodle26stable' of https://github.com/nadavkav/moodle into MOODLE_26_STABLE

commit 849c19022c922e5d39df49fd59f07872e4dc9c55
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:26:51 +0800
Tag:    v2.6.4

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

commit 0076ac2d1c1401c4f6979e78e45b2db60d17f672
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 09:10:33 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-46144' of https://github.com/totara/moodle into MOODLE_26_STABLE

commit 8ce2f33f9e25666bfab43de5fbe13e280db67013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:42:43 +0800
Tag:    v2.6.4

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

commit ca13549a89eebf3bbdf70833613d4c03bf6a8a3f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:37:14 +0800
Tag:    v2.6.4

Merge branch 'wip_MDL-46126_m26_passnulls' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 20e563e82518af24460cdf088e4e6a0057cc51c7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 08 Jul 2014 05:28:25 +0800
Tag:    v2.6.4

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

commit 2ce17661e8307e31ec6bbc6fbce85003b42a5b47
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 02 Jul 2014 05:31:10 +0800
Tag:    v2.6.4

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

commit 3bbb37741f0a1c46e958f8f9df4449ec62712ee3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 01 Jul 2014 05:06:16 +0800
Tag:    v2.6.4

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

commit 42a1546bf88ea831a3736be2a9313b4b171cc302
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 11:00:31 +0800
Tag:    v2.6.4

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

commit b51ee5ac52e1374c61b8fb898263116f90c9181c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jun 2014 04:57:35 +0800
Tag:    v2.6.4

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

commit 18c31e25b608b5beaecb3e7a5a6b247532693ff0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 10:28:07 +0800
Tag:    v2.6.4

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

commit bc389ac7c8f80327b06e8994a3b740ae289f5ce0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 29 May 2014 04:12:37 +0800
Tag:    v2.6.4

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

commit 5abf0019f5006dd6be4b3ca7ee42faf803822c4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:59:14 +0800
Tag:    v2.6.4

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

commit 7ec197fd6435bed176cf82adf267bb1224f0112a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 09:23:06 +0800
Tag:    v2.6.4

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

commit 967d16dd5289303968a8b7bc77d8f0cddad68db5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 07:52:35 +0800
Tag:    v2.6.4

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

commit 5b4b64fc5823da238ee61efbb2bd75ae01cc97b3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:55:14 +0800
Tag:    v2.6.4

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

commit 362598367cf05419b419101e3801d5d1b068a074
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 06:38:22 +0800
Tag:    v2.6.4

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

commit 43b611f5663d9eca31ab19f41ad068dc50d4a51e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:58:59 +0800
Tag:    v2.6.4

Merge branch 'm26_MDL-45623' of git://github.com/totara/moodle into MOODLE_26_STABLE

commit 9832d18ab5708abfd4609007cd3fdc76b9b0d6e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:53:46 +0800
Tag:    v2.6.4

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

commit 201d502a9b0623099c6c7e60096074eed4d0c9e4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 05:02:49 +0800
Tag:    v2.6.4

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

commit 1a49438ade9dd93771a8e0f87d6a09f354766075
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 26 May 2014 04:58:08 +0800
Tag:    v2.6.4

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

commit e77dcc602d4eec8c1fff2f256ffbeeef9e710108
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:45:21 +0800
Tag:    v2.6.4

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

commit aa1d665a3a0a195102e44f9fb6793c2b5f72d9bd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 11:39:31 +0800
Tag:    v2.6.4

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

commit 43f39c235f47cfd45bc6b587ea39d809453ce066
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 09:59:33 +0800
Tag:    v2.6.4

Merge branch 'MDL-45603-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE

commit 7d14ae30e94862f4a98f4b3e1f43dc4ba1f21fae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:58:18 +0800
Tag:    v2.6.4

Merge branch 'MDL-45477-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit 8ffb7387214968ddfc901cee79cf272baae6a1a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 07:55:47 +0800
Tag:    v2.6.4

Merge branch 'MDL-45535-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE

commit cf1cf9499ff20b948e4ced1bdb075859e63f996a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 06:42:19 +0800
Tag:    v2.6.4

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

commit d18bc9dc0273cad481ccae9cf5785c4f89b6e173
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:53:11 +0800
Tag:    v2.6.4

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

commit 17f8fb7f3e07ac87969bd875c25bdac2688fa69a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 20 May 2014 04:47:21 +0800
Tag:    v2.6.4

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

commit 14f40dcc9c0206d72ae8fb563f18ff59cc8fe751
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 19 May 2014 09:37:19 +0800
Tag:    v2.6.4

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