Git merges in Moodle x.x.x by James Pratt
commit 6ebfe7e5f182fc582e374cbd44d257be74e686ac
Author: James Pratt <me@jamiep.org>
Date: Wed, 20 Nov 2013 12:33:49 +0800
Tag: v2.7.0-beta
Merge branch 'MDL-42957-26' into MDL-42957-master
commit 701baddf732077dd6818d1d19136be02a108c058
Author: Jamie Pratt <me@jamiep.org>
Date: Wed, 08 Aug 2012 17:06:25 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_js_fix_22' into wip_js_fix
commit d99d47fdcad8292ea1b9e5e4c3a63987d3fb6c82
Author: Jamie Pratt <me@jamiep.org>
Date: Wed, 08 Aug 2012 17:05:10 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_js_fix_21' into wip_js_fix_22
commit 3505610d11497412422bdc7a25c049de692a0442
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 21 Jun 2012 15:22:00 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
commit b0da01d272198c9497f1c416a5960c73d44d9c25
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 21 Jun 2012 15:21:59 +0800
Tag: v3.0.0-beta
MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
commit 940c0c76cb6338dbfc040b4fe6fdf041ae251e89
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 21 Jun 2012 14:42:52 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
commit 5de5ae31ee69322c02e169902f430cb2f2286a41
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 21 Jun 2012 14:42:44 +0800
Tag: v3.0.0-beta
MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
commit db344be62c96844b934eec8f66538150a31a6a33
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 21 Jun 2012 14:40:01 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes
commit 0291aa6672568078e7a42dc577a4927033624f55
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 19 Jun 2012 20:16:09 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_readme_2_1' into wip_readme
commit 6521797d7bf80c889e82011ff4cf26062f8bfaab
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 08 May 2012 13:42:39 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' of git://github.com/moodleou/moodle-qtype_ddimageortext
commit 6396b9342fbc008c498740e7d25d699822163674
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 10 Apr 2012 21:29:06 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_readme_2_1' into wip_readme
commit 19f5c30c25d8667318af2fb6d4c69d8f9d1ff95b
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 08 Apr 2012 20:29:10 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
commit 4a1582ab7c2acf1c7f9caa99b064b2e89515e3fe
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 08 Apr 2012 19:17:55 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
commit 2578a29ac2f8bae890f43ed2c5cc407ebf7a2c02
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 07 Apr 2012 15:37:29 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
commit 4b47ad46232c60cb42402ef2ca9f749eeae796b2
Author: Jamie Pratt <me@jamiep.org>
Date: Mon, 02 Apr 2012 19:59:10 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit 874007d480a6fc3a8d3561378f530ce9c59692ba
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 31 Mar 2012 19:54:49 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit b30cfa2c4fa3a3aad132785c209036f2d5165046
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 29 Mar 2012 15:07:44 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit a922c16cb7a0a473e740ad846b60ebed6fa18617
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 27 Mar 2012 19:22:09 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit 466faa083aa22efa8c3655a5c0df37de9be8f742
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 27 Mar 2012 18:35:35 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit 49d7891f6092a7e92ba5316593fd80e916a88196
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 22 Mar 2012 10:53:48 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit f22414b1e564638d295c2bfae25ac9672cb62cf7
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 28 Feb 2012 14:07:45 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
commit 415893bb24350b8a3d23307d8164c6079c7bb6b1
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 05 Feb 2012 19:44:23 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'
commit 8f042b51590761ca020173a19cf6fa0fd1a31e4d
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 05 Feb 2012 15:12:19 +0800
Tag: v3.0.0-beta
MDL-47494 ddwtos: Merge branch 'MOODLE_21_STABLE'
commit 266eade0cde0c0ecbdb98ff44b18c69f7ff8f1c5
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 05 Feb 2012 13:57:56 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'MOODLE_21_STABLE'
commit 6420d735b1a11bbb74790c82b6034b7c441e358f
Author: Jamie Pratt <me@jamiep.org>
Date: Sun, 05 Feb 2012 13:56:06 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'
commit 533a0aa2be915d53b09db640656d0297def319b5
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 04 Feb 2012 19:27:11 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'diff_2_2' changes for Moodle 2.2+
commit 209d3e7ad581b2bef116c07ac1d06549ef7c4441
Author: Jamie Pratt <me@jamiep.org>
Date: Fri, 03 Feb 2012 13:55:34 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'
commit d82d9b649fbc4c8f2197749d597bed934c797e9d
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 31 Jan 2012 17:23:11 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE' of github.com:jamiepratt/moodle-qtype_ddimageortext into MOODLE_21_STABLE
commit 16be22cd316407e579ba26c67499cd886b318249
Author: jamiepratt <me@jamiep.org>
Date: Fri, 09 Dec 2011 14:00:46 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge pull request #6 from timhunt/MOODLE_21_STABLE
commit a26cec5a4129cb92a031257afff6d66d7706f719
Author: jamiepratt <me@jamiep.org>
Date: Fri, 02 Dec 2011 21:35:01 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge pull request #5 from timhunt/MOODLE_21_STABLE
commit f00f4682d99ea4b998c33aab04ed0ef0d9932e98
Author: Jamie Pratt <me@jamiep.org>
Date: Tue, 29 Nov 2011 08:07:26 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit d857b79a55b1396f49b1f75a71227198950639dd
Author: jamiepratt <me@jamiep.org>
Date: Thu, 24 Nov 2011 01:10:16 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge pull request #4 from timhunt/MOODLE_21_STABLE
commit 615888af8e661b324a0413aaf7706813588597ed
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 19 Nov 2011 18:24:20 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit 3c63e5916e12880eb70a8e1f2c27149d42fc2270
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 19 Nov 2011 18:11:25 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit 2bd257656b2177ac73e7fcf6c03441a1ca1ef497
Author: Jamie Pratt <me@jamiep.org>
Date: Sat, 19 Nov 2011 18:09:18 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit e8decd151d95ce4bc6f736e7f486ab1b3a3923f9
Author: Jamie Pratt <me@jamiep.org>
Date: Fri, 18 Nov 2011 19:37:57 +0800
Tag: v3.0.0-beta
MDL-47494 ddmarker: Merge branch 'master' of git://github.com/jamiepratt/moodle-qtype_ddmarker
commit ef3bc620e98d779d2212dcceac631ac9016286c5
Author: jamiepratt <me@jamiep.org>
Date: Mon, 07 Nov 2011 19:57:15 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge pull request #1 from timhunt/master
commit 5e0be900ae830258a1271c32c66cffd6ee9c3c8a
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 03 Nov 2011 17:21:29 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit f8d20b1f18f5fdf34db4d80ff310774b562e490f
Author: Jamie Pratt <me@jamiep.org>
Date: Wed, 02 Nov 2011 14:53:07 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit c77b71bc1bf1e2addf7a365971713be1e885f949
Author: Jamie Pratt <me@jamiep.org>
Date: Mon, 31 Oct 2011 19:55:08 +0800
Tag: v3.0.0-beta
MDL-47494 ddimageortext: Merge branch 'master' into MOODLE_21_STABLE
commit 68cd4818c4c4cbe50bd5e550f9d9dc6525d2fbf8
Author: Jamie Pratt <me@jamiep.org>
Date: Thu, 13 Oct 2011 20:07:43 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'master' of git://github.com/timhunt/moodle-qtype_gapselect
commit 769fd123e40dbd0f9ea8b893c3834b1372d5e30b
Author: Jamie Pratt <me@jamiep.org>
Date: Wed, 24 Aug 2011 19:42:01 +0800
Tag: v3.0.0-beta
MDL-47494 gapselect: Merge branch 'master' of git://github.com/timhunt/moodle-qtype_gapselect