Git merges in Moodle 2.9.6 by Dan Poltawski
commit 061fd45c33a42fe3cefb7d744977cef5d4c677b9
Author: Dan Poltawski <dan@moodle.com>
Date: Fri, 06 May 2016 21:09:28 +0800
Tag: v2.9.6
Merge branch 'MDL-54042-29' of git://github.com/damyon/moodle into MOODLE_29_STABLE
commit 9a5709f474f7fa7bfd5ca18cf96005c7a18db6d7
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 04 May 2016 03:38:03 +0800
Tag: v2.9.6
Merge branch 'install_29_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_29_STABLE
commit efa18040dc37e35a8aff7f02597e1391b20cf1f2
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 May 2016 16:13:29 +0800
Tag: v2.9.6
Merge branch 'wip-MDL-53402-29-v2' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE
commit fe404e039c84fb41e1a62680d30ed9dd7f43f85d
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 May 2016 16:09:08 +0800
Tag: v2.9.6
Merge branch 'MDL-54008_29-normalise' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE
commit 166a09028f95751c7653f2dc61f3d2a1dbb98a12
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 03 May 2016 00:06:28 +0800
Tag: v2.9.6
Merge branch 'wip-MDL-53402-29' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE
commit a34068d1266a9eaab31444e7e6f76215a0650b57
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 May 2016 23:57:14 +0800
Tag: v2.9.6
Merge branch 'MDL-54019_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE
commit 7d0051154e8756a319b505391d7385231de74286
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 May 2016 23:55:53 +0800
Tag: v2.9.6
Merge branch 'wip-mdl-53861-m29' of https://github.com/rajeshtaneja/moodle into MOODLE_29_STABLE
commit ecccb0d30ccc8191d1e6c0dcc2f554377ea857b7
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 May 2016 17:17:11 +0800
Tag: v2.9.6
Merge branch 'wip_MDL-53033_m29' of git://github.com/gjb2048/moodle into MOODLE_29_STABLE
commit 3ece99e9d0aa3e5e11134dd7667ab2140156574d
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 May 2016 17:16:38 +0800
Tag: v2.9.6
Merge branch 'MDL-53904-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE
commit 283375144b2a688db9d94bdfc4472c44b1e55de4
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 02 May 2016 16:52:25 +0800
Tag: v2.9.6
Merge branch 'MDL-54008_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE
commit 7159a9ab0c40daa4c233fc288af1473aefb51ecb
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 26 Apr 2016 18:18:31 +0800
Tag: v2.9.6
Merge branch 'MDL-53855_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commit f570ad59cf54a7002167f6a7e5b12c8dd4c0a1b2
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 25 Apr 2016 21:13:53 +0800
Tag: v2.9.6
Merge branch 'MDL-49754-29' of https://github.com/xow/moodle into MOODLE_29_STABLE
commit 38dbbecc4d9e6c233b8803bd14bfda6b045b2423
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 20 Apr 2016 20:48:39 +0800
Tag: v2.9.6
Merge branch 'wip-MDL-52642-29' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE
commit 9b2faf2056afe5eb4966f970afa614ff80344eeb
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 20 Apr 2016 18:52:16 +0800
Tag: v2.9.6
Merge branch 'MDL-53095-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE
commit bf980316b011e898a725f6f4c29bc7c31b497d9a
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 12 Apr 2016 23:50:32 +0800
Tag: v2.9.6
Merge branch 'MDL-52263-29' of git://github.com/crazyserver/moodle into MOODLE_29_STABLE
commit e0339be4168bf416a5f2d3188b4e17aa5b6df9fb
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 12 Apr 2016 20:13:59 +0800
Tag: v2.9.6
Merge branch 'MDL-52944-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE
commit e43bea4883bf89a7a28d3830d16b311ceb436374
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 11 Apr 2016 23:37:09 +0800
Tag: v2.9.6
Merge branch 'MDL-53417-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE
commit 3f80f680adc422556fe5f25297f17db309f79c9b
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 11 Apr 2016 21:29:16 +0800
Tag: v2.9.6
Merge branch 'MDL-53674-29-eventmsg' of git://github.com/mudrd8mz/moodle into MOODLE_29_STABLE
commit 5f100892d0335c1cb6bd9dd277fedc56acb41d69
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 11 Apr 2016 21:10:24 +0800
Tag: v2.9.6
Merge branch 'MDL-53728_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commit e561b3b818ef592fcaa49de983a9e4e45140658f
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 11 Apr 2016 20:53:22 +0800
Tag: v2.9.6
Merge branch 'MDL-52338-29' of https://github.com/dg711/moodle into MOODLE_29_STABLE
commit 888adbee071570d24c8aac0d84ad550e4725c1d5
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 06 Apr 2016 22:48:03 +0800
Tag: v2.9.6
Merge branch 'MDL-53000-29' of git://github.com/jleyva/moodle into MOODLE_29_STABLE
commit 01d1a3300bc8b881fe72849a199414aa9330b63e
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 05 Apr 2016 21:34:14 +0800
Tag: v2.9.6
Merge branch 'MDL-53000-29' of git://github.com/jleyva/moodle into MOODLE_29_STABLE
commit aa86e76af8f72b2071f108d0e33c5f77fb71fe23
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 05 Apr 2016 19:17:45 +0800
Tag: v2.9.6
Merge branch 'MDL-53175-29' of git://github.com/jleyva/moodle into MOODLE_29_STABLE
commit 5e01d610140a45ff5e16cedc72ac4901beebd8e6
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 04 Apr 2016 19:10:21 +0800
Tag: v2.9.6
Merge branch 'wip-MDL-49861-29' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE
commit 9f724212eec684ee523c9d092c78118639e86a6f
Author: Dan Poltawski <dan@moodle.com>
Date: Thu, 31 Mar 2016 14:06:31 +0800
Tag: v2.9.6
Merge branch 'install_29_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_29_STABLE
commit c0554789147bfa71ef0776aa8674fe8d7d25209e
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 29 Mar 2016 10:24:36 +0800
Tag: v2.9.6
Merge branch 'MDL-52976-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE
commit 996a5331ab11853e1f7439c2f2011120e24d9a08
Author: Dan Poltawski <dan@moodle.com>
Date: Sat, 26 Mar 2016 11:37:40 +0800
Tag: v2.9.6
Merge branch 'wip-MDL-53538-29' of git://github.com/abgreeve/moodle into MOODLE_29_STABLE
commit 27891b6a0d8a28dc4e71079f8aa6c76600bf9ce1
Author: Dan Poltawski <dan@moodle.com>
Date: Sat, 26 Mar 2016 10:36:39 +0800
Tag: v2.9.6
Merge branch 'MDL-53562-forum-reply-re-MOODLE_29_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_29_STABLE
commit bd9348c53240593cc9db16eeeb79edc7ce3ea1fb
Author: Dan Poltawski <dan@moodle.com>
Date: Sat, 26 Mar 2016 10:06:13 +0800
Tag: v2.9.6
Merge branch 'MDL-53507_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commit b40e2262d3379295d28364eaa95c76f6aff36201
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 23 Mar 2016 12:08:08 +0800
Tag: v2.9.6
Merge branch 'MDL-52952-29-fix' of github.com:xow/moodle into MOODLE_29_STABLE
commit 10d22b709c24a70ca16d48638ed741e7357a6863
Author: Dan Poltawski <dan@moodle.com>
Date: Wed, 23 Mar 2016 08:31:54 +0800
Tag: v2.9.6
Merge branch 'MDL-53383-29' of git://github.com/andrewnicols/moodle into MOODLE_29_STABLE
commit 069cea91f6b330fd528dd57cc795473b7da01f1c
Author: Dan Poltawski <dan@moodle.com>
Date: Tue, 22 Mar 2016 10:32:33 +0800
Tag: v2.9.6
Merge branch 'MDL-52158-29' of https://github.com/xow/moodle into MOODLE_29_STABLE
commit dda9cf907f17265f2125f3404f14a74d7aae99b7
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 14:48:44 +0800
Tag: v2.9.6
Merge branch 'MOODLE_29_STABLE-MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle into MOODLE_29_STABLE
commit f9b568088ea7ba240baa96a518dffa1960fc67cf
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 14:44:20 +0800
Tag: v2.9.6
Merge branch 'MDL-52952-29' of https://github.com/xow/moodle into MOODLE_29_STABLE
commit 256a84657b3275208af6515f5f73e05b9625c0d8
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 14:12:14 +0800
Tag: v2.9.6
Merge branch 'MDL-53239_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE
commit bf56548d6041388bf10205ef8ab2a9662697baba
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 11:37:37 +0800
Tag: v2.9.6
Merge branch 'MDL-53262-verp-confirm-from-support-MOODLE_29_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_29_STABLE
commit 7aee70bd084c3b0b9649711c673aad9f6d441a20
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 11:02:05 +0800
Tag: v2.9.6
Merge branch 'MDL-53489_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commit b8b55ad3f43caf18092847ba8e883def6ac6e1ed
Author: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 Mar 2016 09:20:36 +0800
Tag: v2.9.6
Merge branch 'MDL-53548-m29' of https://github.com/sammarshallou/moodle into MOODLE_29_STABLE