Developer credits

Git merges in Moodle x.x.x by Tim Hunt

commit 5c8d91d83f4cef978ea4947ad5924d684aef3c4f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 18 Sep 2015 14:51:37 +0800
Tag:    v3.0.0-beta

Merge branch 'MDL-47494-ddmarker' into MDL-47494

commit 2ce6a9c64f35a9cca3bb44b05fe4f46cbacf4a36
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 18 Sep 2015 14:51:36 +0800
Tag:    v3.0.0-beta

Merge branch 'MDL-47494-ddimageortext' into MDL-47494

commit 55d4613f22b39ab64870f0f791457385bea636b6
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 18 Sep 2015 14:51:34 +0800
Tag:    v3.0.0-beta

Merge branch 'MDL-47494-ddwtos' into MDL-47494

commit 1fc5d49cc21a5370429050ad703346564d9647a0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 18 Sep 2015 14:51:33 +0800
Tag:    v3.0.0-beta

Merge branch 'MDL-47494-gapselect' into MDL-47494

commit f0c1f1240591e3611cd81fbceb31eb7e560e7347
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 18 Mar 2015 21:26:20 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'projectestac-master'

commit 499e5dc0c5440c28ca2a30024cfecfc5d4bda380
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Tue, 29 Apr 2014 03:21:16 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #25 from jamiepratt/MDL-45111-master

commit db50ffecf54d8ee44c40dba4034db549b9ab791b
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 18 Sep 2013 00:50:24 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #23 from merrill-oakland/master

commit 984efa0c94a0b80910bf0abe01894fce92b44ad1
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Tue, 20 Aug 2013 19:09:12 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #20 from jamiepratt/wip_CONTRIB-4557

commit b4db7c2f7b1dca366b803dc54eafe2623a96cdfa
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Tue, 20 Aug 2013 19:08:54 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #22 from jamiepratt/wip_CONTRIB-4557

commit 6bcdbcf6b7fdec8e091c112957b3e28372ae5692
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 01 Jul 2013 18:50:52 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #12 from colchambers/wip6609.1

commit 6ffa80e52808b728863b7a697d68626aa2fc12d9
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 06 Jun 2013 22:56:03 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #21 from colchambers/wip6859.1

commit bcf13bf0f6d12765052dfca912f339e50a4652e0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 06 Jun 2013 22:55:52 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #20 from jamiepratt/wipnoofdrags

commit aa877b5b495421cdd259fe56ac75422865c352fe
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 17 May 2013 22:08:15 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #11 from colchambers/wip6846

commit 150f70266e9089b6904d78133f08ad78bd5f129e
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 15 May 2013 20:16:58 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #10 from jamiepratt/wip_move_combinable_dirs

commit 4ff00ebb024b4112d0e50bb4b37e39ae897d6516
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 30 Jan 2013 19:35:29 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #17 from colchambers/MDL-37463

commit feab78b6a6c25d6481b82ac23d987e8d7a3ebfae
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 30 Jan 2013 00:13:57 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #16 from colchambers/MDL-37759

commit 463f4b4c6a9a53f9d4e7d0aab6278b8cc97a071c
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 29 Sep 2012 01:13:43 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_22_STABLE'

commit 7e6b0bc1f17cc0fd89c66d7bb098e06f3054f995
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 29 Sep 2012 01:13:28 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE' into MOODLE_22_STABLE

commit 8aaa057e3a535a13c74a61e280fc089b6809aa55
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 30 Aug 2012 20:48:35 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #9 from ndunand/master

commit 664a362d0cd9d732f3fd0c4eaec0db4ac226bc17
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 30 Aug 2012 20:43:55 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #10 from ndunand/master

commit 323869e159b54f22b7aafe361be89610bf9765f7
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 30 Aug 2012 20:40:11 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #18 from ndunand/master

commit 94c4876d658247f7193278cb570d382b5d9b3355
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 30 Aug 2012 20:36:11 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #14 from ndunand/master

commit c3bb638a53bd451c9214abdf00ff2058f196331f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 20 Aug 2012 21:41:25 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge branch 'MOODLE_22_STABLE'

commit 480efcf7c7a0c13c490bc4cb7ab84bf815b1d42d
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 20 Aug 2012 21:39:54 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge branch 'MOODLE_22_STABLE'

commit 599cad2bb2a25bb1e93638363c8d2295d1f7084f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 20 Aug 2012 21:39:07 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_22_STABLE'

commit 270a93ecfc2d8a5d6bec9676006159c979e83c0b
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 20 Aug 2012 21:34:58 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge branch 'MOODLE_22_STABLE'

commit 34632b52d6d1bd109e85181edd037aeecec29318
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 08 Aug 2012 19:14:33 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #17 from jamiepratt/wip_js_fix

commit 6cbe5bb3b2a1b26dddbefcc4fd17c3190a19020b
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 08 Aug 2012 19:14:22 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #16 from jamiepratt/wip_js_fix_22

commit 5355d9557bdad2083db81c29a251c3b35270bc4f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 08 Aug 2012 00:39:16 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_22_STABLE'

commit 148c37f7d7e7f946393b5225bc8c83518bac28d0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 08 Aug 2012 00:37:30 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE' into MOODLE_22_STABLE

commit 2da2c6d949b76a92d0756ad0c13427db68826a61
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 06 Aug 2012 23:06:31 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge branch 'MOODLE_22_STABLE'

commit 5fb9aa82c7ef3d85737f7eec5f11d52d49aac0e1
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 06 Aug 2012 23:05:35 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE' into MOODLE_22_STABLE

commit 13fb13336506282e3488f9aab840f5d9661dc873
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 30 Jul 2012 18:27:39 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #14 from jamiepratt/wip_ou-4201_php_strict_notices

commit bc1937e8cb02f952c26e5332b76fc1cef325248a
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 30 Jul 2012 18:26:48 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #13 from jamiepratt/wip_highlight

commit 1577cd61c827ea0c52de8d75c2750e7ad01bf6eb
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 21:01:23 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #9 from jamiepratt/wip_ou-4202_version_fixes

commit bc338a5b278a7c603a2b3c6bcf373ad0341027d7
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 20:58:58 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #8 from jamiepratt/wip_ou-4200_ddfix

commit f4a48bfc0b0b8a1e4deea1e884e2f9829572ad18
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 20:58:31 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #7 from jamiepratt/wip_ou-4202_version_fixes

commit 09c8445abf303422c2ab7f69d057536fc6e88b47
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 20:57:32 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #11 from jamiepratt/wip_ou-4193_ddfix

commit c5c1a3d69467916758ed780ecbc08eb952443eb7
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 20:57:05 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #12 from jamiepratt/wip_ou-4202_version_fix

commit 1fd56de47fe7e90fd706bee4954c5fe1f9be1a87
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 27 Jul 2012 20:56:49 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #13 from jamiepratt/wip_ou-4202_version_fixes

commit 9cc064abf87a306c247b9ce6b0d0f71a18f639fd
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:24:40 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge remote-tracking branch 'ou/MOODLE_21_STABLE' into MOODLE_22_STABLE

commit 78393112f3fcc4790edead7fab7d63afd0944c83
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:24:05 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #6 from jamiepratt/wip_lib_php_fixes_2_1

commit d958b907651a7fff15938979aa75e6c69a253be0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:23:51 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #5 from jamiepratt/wip_lib_fixes

commit 857b88d25278892c46f66905bcdea2056eb64123
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:22:31 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge remote-tracking branch 'ou/MOODLE_21_STABLE' into MOODLE_22_STABLE

commit 4b7850c8ef9170638aac54d864b3a1993d9627a8
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:21:51 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #7 from jamiepratt/wip_lib_php_fixes_2_1

commit 3f7251bbe90ccdfea6abc70d877f327d8b969553
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:21:45 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #6 from jamiepratt/wip_lib_fixes

commit 3de985b747d5436e4168893341c8f2d3d313829d
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:19:47 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #9 from jamiepratt/wip_lib_php_fixes_2_1

commit 9a25a40521c68c1383f91e42b37c34035a4fb2ab
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 21 Jun 2012 17:19:42 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #10 from jamiepratt/wip_lib_fixes

commit 08b47def1ffacbbc3e17ebd9a89bbcef2148ad36
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 19:21:55 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #4 from jamiepratt/wip_unittestconversions

commit 1b9d6bb270d9aa6d075af21dd6c8111c6651c72f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 19:21:40 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge pull request #3 from chillofoctober/master

commit d33e1b6a7810fbd4790df100cd2183efe36cbc6f
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 19:18:33 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #4 from jamiepratt/wip_unittestconversions

commit 77192cf30535922285e418f4f4ab77a18a869ffb
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 17:54:05 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge remote-tracking branch 'jp/wip_unittestconversions'

commit 521f92010ebc7db70092ba521db727fad3d3255b
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 17:47:14 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #9 from jamiepratt/wip_readme_2_1

commit 41db46c6f96633ec7be108adc32d2baf377e8a20
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 17:46:47 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #7 from jamiepratt/wip_readme

commit 75ba4c55766fe0ad0fb9b423a0582a60764e60a4
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 17:42:55 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #12 from jamiepratt/wip_file_access_2_3

commit f44c7f19986b962efa2471e6438f6b43bc536aed
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 20 Jun 2012 17:40:10 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #7 from jamiepratt/wip_file_access_2_3

commit 3f22d29ccee6872ec393c507bb51276185ebf3e9
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 18 Jun 2012 23:40:10 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge pull request #3 from chillofoctober/master

commit 0c859404c9b2574b1ec1912ad69db137eff3bb33
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Mon, 18 Jun 2012 23:34:34 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #6 from jamiepratt/wip_unittestconversions

commit 8ece5d73a065a4cf0282593df22223339ad4c738
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Wed, 13 Jun 2012 18:48:58 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #10 from chillofoctober/master

commit 201061d943c1c88f1dfd2bfa445e9892dd4e7e20
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 08 Jun 2012 20:19:55 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #3 from jamiepratt/master

commit aad328b21d96e1f0afc92c33043612de8564dfea
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 11 Feb 2012 00:25:40 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'

commit d8555d4a9f99a26b52c8d215e8fb87083f98bd7c
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 11 Feb 2012 00:22:23 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge branch 'MOODLE_21_STABLE'

commit 141233ed2c51177c2fbf67187fe5e9a15c6452fb
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 11 Feb 2012 00:20:27 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge remote-tracking branch 'jp/master'

commit 0a32d51a3312c16df824d0d286bc0bb18800867e
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 11 Feb 2012 00:13:00 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge remote-tracking branch 'jp/MOODLE_21_STABLE' into MOODLE_21_STABLE

commit eeb58297a6d44b12ae4861c227a7870c791a7df4
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sat, 11 Feb 2012 00:00:47 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE'

commit fee4224fcc91ea18009a165c6b492c4d9a50f8bb
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 10 Feb 2012 23:45:07 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge remote-tracking branch 'jp/MOODLE_21_STABLE' into MOODLE_21_STABLE

commit 90e64ecb4ee6af9c8c797f3f00bb386ecef89f29
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 10 Feb 2012 23:14:51 +0800
Tag:    v3.0.0-beta

MDL-47494 ddwtos: Merge branch 'MOODLE_21_STABLE'

commit 61809dfaaaeb8082e2ead683a952de166bb01ea8
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 10 Feb 2012 22:46:42 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge branch 'MOODLE_21_STABLE'

commit be806cc405263c9dd311872eac5821e9dd95fbb4
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Fri, 10 Feb 2012 22:45:04 +0800
Tag:    v3.0.0-beta

MDL-47494 gapselect: Merge remote-tracking branch 'jp/master'

commit 063ce1658b6208368c84359f915ea91cae64ef41
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sun, 05 Feb 2012 15:31:36 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #1 from jamiepratt/master

commit 218d0acb987a7e80157794785acd58e1912d94fe
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sun, 05 Feb 2012 15:27:31 +0800
Tag:    v3.0.0-beta

MDL-47494 ddmarker: Merge pull request #2 from jamiepratt/MOODLE_21_STABLE

commit 9fde49522dca2c0ac9232707906404956da5295c
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sun, 05 Feb 2012 15:26:43 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #1 from jamiepratt/master

commit aa9ab4a474310b19eb0ce45ad72349fb995a30a3
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Sun, 05 Feb 2012 15:25:47 +0800
Tag:    v3.0.0-beta

MDL-47494 ddimageortext: Merge pull request #2 from jamiepratt/MOODLE_21_STABLE

commit 54771d89d1571ae8521a3565f87c5ed1623565b0
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Tue, 07 Jun 2011 00:14:59 +0800
Tag:    v2.1.0

Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine

commit a2ac23495656d62cf4c203be72f3ff2423b2ca8a
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 12 May 2011 03:29:49 +0800
Tag:    v2.1.0

MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade

commit e2cba246b724efe1ef72bc98d70b92e37999a0be
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 03 Mar 2011 01:34:18 +0800
Tag:    v2.1.0

MDL-20636 Merge vle/master into ouqe2

commit 74c479f212894edc81ee49e34248c1cdbe1c229a
Author: Tim Hunt <T.J.Hunt@open.ac.uk>
Date:   Thu, 03 Feb 2011 19:07:11 +0800
Tag:    v2.1.0

MDL-20636 Merge branch 'master' into qe2_wip