Git merges in Moodle 2.6.3 by Dan Poltawski

commit a9d14d2a3628c11c9d9a2f0a1ccea4700300770a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 10:51:53 +0800
Tag:    v2.6.3

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

commit 20b65746e37ef1afd62dbf0afae5d01d59bcb7bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 16:40:42 +0800
Tag:    v2.6.3

Merge branch 'MDL-45410-en_fix-26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE

commit c1d62ed25da0aabc62257aa6649bc35834f6f4a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 12:05:43 +0800
Tag:    v2.6.3

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

commit 34d75ff1157ab11142b70b36abe74d6e427e55cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 11:50:13 +0800
Tag:    v2.6.3

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

commit e8d36cbc1a122c63ca0aee280a1f51cf8255da68
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:16:40 +0800
Tag:    v2.6.3

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

commit 9ea9d487afdddb28fcfa00086e7a4da76479644e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 10:18:44 +0800
Tag:    v2.6.3

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

commit 30453f2bc888e59aee15441f274d777affa52c1b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 17:45:41 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 8cc974000b9b71aa92cc78270d200681a0aa563b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:52:06 +0800
Tag:    v2.6.3

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

commit 47cdef3d705b5de4b40087aeee67f76e59f4167b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:36:06 +0800
Tag:    v2.6.3

Merge branch 'MDL-43570-M26' of https://github.com/KristerV/moodle into MOODLE_26_STABLE

commit 278d605714edd6d338a0367c57e14641421ee86f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 12:36:00 +0800
Tag:    v2.6.3

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

commit 62fa6fc6d5f1c35c7d6d3c0e0ac9e2df6a8540e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 10:40:58 +0800
Tag:    v2.6.3

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

commit e363a0fb6a68e8783540f66daedaa89fb89fd003
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 15:48:58 +0800
Tag:    v2.6.3

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

commit 8f8f5834067a5f092a1a602d67c9af7044a069d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:58:49 +0800
Tag:    v2.6.3

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

commit e679eb6c27d12a2dd64180f4d795c4f790a5c8f1
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 17:56:45 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit 53318d684adb88e89245de549907b539ed317411
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 10:00:59 +0800
Tag:    v2.6.3

Merge branch '45046-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 5d933a6abe35ce49566594f4c1c04394315beee9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:40:26 +0800
Tag:    v2.6.3

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

commit 4a85e96b97319c4108ea4d14ac1e23744fd9c268
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:18:14 +0800
Tag:    v2.6.3

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

commit e3986158bfb67fca485e599ab4cdec157c844908
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 14:22:21 +0800
Tag:    v2.6.3

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

commit 0574e41f62c3f57862fa7246ab68b1c510779785
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 12:36:02 +0800
Tag:    v2.6.3

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

commit 1e19ea00d862e7a8595ab186c230244aaf3a4fba
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:41:46 +0800
Tag:    v2.6.3

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

commit e0b97841382050942fd738014257d8c6cc90f42e
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 15:27:41 +0800
Tag:    v2.6.3

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

commit fc67885300c9c5bc29a018cae85ede87f4187aa2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:55:33 +0800
Tag:    v2.6.3

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

commit f21e920beb051b34bf25bf1fd13ac59b556a2ca1
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:52:48 +0800
Tag:    v2.6.3

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

commit 8019375e128d6b66cde91afe53dd2b3638672dfb
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:50:07 +0800
Tag:    v2.6.3

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

commit 3c9bd29d89e1dc526360d07537f590573686b66b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:47:06 +0800
Tag:    v2.6.3

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

commit cafeac819fc745c24674a2d44e87793538c84655
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:32:18 +0800
Tag:    v2.6.3

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

commit 6e674be060ec6ddd355cc942c5ee3f8d4728a6e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:05:27 +0800
Tag:    v2.6.3

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

commit 84cff478149b7f3f4d07835ec905e8da19d07fec
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 09:57:22 +0800
Tag:    v2.6.3

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

commit b2f7a0b31fe8a6810520d981a745af751119e246
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 Apr 2014 17:01:43 +0800
Tag:    v2.6.3

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

commit 8ce6a7dfd3d052c6c9f32ccde086d1bb57db7c25
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 14:35:01 +0800
Tag:    v2.6.3

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

commit 63a9c2522c2839d0eec0ff2f669dd14684e9a8cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:56:39 +0800
Tag:    v2.6.3

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

commit 9b7456b82e7437939be4d5710f36ec9c496652e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 11:39:50 +0800
Tag:    v2.6.3

Merge branch 'MDL-44295_v26' of https://github.com/scyrma/moodle into MOODLE_26_STABLE

commit f588d0efad0fb37cfbf018b35a2199cae84e0548
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 10:30:45 +0800
Tag:    v2.6.3

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

commit 1c5bdb54b74cfb7077ffc9404c7459ad44398f45
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 09:10:32 +0800
Tag:    v2.6.3

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

commit 8240dc0f0174a84144bb36b97c91b41128631a3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:33:16 +0800
Tag:    v2.6.3

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

commit 812bee0f4f84331bf72935eaf205268846b32b26
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Apr 2014 10:27:09 +0800
Tag:    v2.6.3

Merge branch '44354-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 8939d65608ece0ccf85bf4244ff487ce12485659
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 15:23:18 +0800
Tag:    v2.6.3

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

commit 951ba5e8a6e4a9fd3e7c54a186c9dfa995411471
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 10:02:01 +0800
Tag:    v2.6.3

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

commit a219c38b13db41b0934897fe4ba7e14afc5ac5a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 11:40:06 +0800
Tag:    v2.6.3

Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE

commit b54edd00e24bd0794845e3ca7dd4eba5a71fd070
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 09 Apr 2014 11:41:26 +0800
Tag:    v2.6.3

Merge branch 'MDL-29572_moodle26' of https://github.com/jrchamp/moodle into MOODLE_26_STABLE

commit 8cb19a633b1d7261ac2beaa5b4e22d0ed821e43e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 08 Apr 2014 09:22:21 +0800
Tag:    v2.6.3

Merge branch '42317-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 80787633cc4538cf353a80a81e8bbf05e8c9526b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 13:10:41 +0800
Tag:    v2.6.3

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

commit 683c7ee245100206b468b42b2ca7359aa15e3bcb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 26 Mar 2014 05:17:55 +0800
Tag:    v2.6.3

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

commit 8a9b350182c131f6c84fded5654fdde6d8c0ab95
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:32:51 +0800
Tag:    v2.6.3

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

commit 2fabb89456b6811e5937fdad6e5eab5575ae2685
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:08:52 +0800
Tag:    v2.6.3

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

commit 1c57cd34e6bda116716267c1345ab2643ddcb384
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:50:42 +0800
Tag:    v2.6.3

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

commit ab9986bf05f44844f2f10571b8609cdc50eb9180
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:41:51 +0800
Tag:    v2.6.3

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

commit a808f245367225a0c657b1c27fc9d02b8524daac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 14:35:40 +0800
Tag:    v2.6.3

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

commit 666af83e4ec497e33be520a09c30942dc0416624
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:37:45 +0800
Tag:    v2.6.3

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

commit af80706515ddb938ea0c39cac79dbc387591c164
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:29:00 +0800
Tag:    v2.6.3

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

commit f9835ffed030118cc1349f7bb8894ae06f29a3a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 13:45:27 +0800
Tag:    v2.6.3

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

commit aacc48a7e67dce3dca169aefc369c9e4ad616531
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 12:04:16 +0800
Tag:    v2.6.3

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