Git merges in Moodle 2.3.0 by Dan Poltawski

commit a2be8d9dbe5fe6b25101f4a057e4a95ff1fe4238
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 21:56:54 +0800
Tag:    v2.3.0

Merge branch 'MDL-33984' of git://github.com/stronk7/moodle

commit a9ca93db95e2a1f55bffff09df03f76e8fc2ccf5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 18:46:59 +0800
Tag:    v2.3.0

Merge branch 'MDL-33984' of git://github.com/stronk7/moodle

commit 3ab04302dd506b0dd806255416743183091b7de4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 16:35:09 +0800
Tag:    v2.3.0

Merge branch 'MDL-33999' of git://github.com/nebgor/moodle

commit 6100b006f18f08f0ac6be6710c7e829104411be1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 16:18:27 +0800
Tag:    v2.3.0

Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle

commit b0d316293034011723283a521dcacaa02f3dc36f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 16:08:33 +0800
Tag:    v2.3.0

Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle

commit 4c8926c7c35e6d73c60652b1b4f65e893c40cd6e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 15:08:12 +0800
Tag:    v2.3.0

Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle

commit d71f207da0a03c277252d8719953e9e846ba36bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 13:00:33 +0800
Tag:    v2.3.0

Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle

commit f935363572e0618555321f4a933f78aff5529e58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 11:20:40 +0800
Tag:    v2.3.0

Merge branch 'MDL-33980' of github.com:equella/moodle

commit 5b7621f78d209d5e877e31afbd973a30ef5596ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 22 Jun 2012 15:09:46 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle

commit 1e485acd7dd9b0cceca688329f79b386c64b2464
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Jun 2012 16:00:08 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33911' of git://github.com/timhunt/moodle

commit 75c8a109e5f0e82ade6c82251fd0133f58671a9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Jun 2012 15:21:13 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign

commit 22b0514e2792ec1450d44661e709b61b0137a97e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Jun 2012 14:56:07 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign

commit 334de6b691e40f2e852cc1c9cdd8e92282995a41
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 21 Jun 2012 10:04:29 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign

commit 5649520d9bfe05d939af73703350c0047ae73e30
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 17:43:47 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle

commit 73ec069e3bc4468bb80b6396f04ef145fd0e39b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 16:55:29 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle

commit e3c7845314df01d2fab08fdd9486cc344268fb1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 16:38:13 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle

commit b1c43c3f64c99e049c210fd735b338a84e8ae082
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 13:57:26 +0800
Tag:    v2.3.0-rc1

Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle

commit a3086f3233e00c3673576e30f91257dc30ccd69d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 13:45:49 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33875' of git://github.com/stronk7/moodle

commit 6e471afe8b76f5a134ef8a1cbeaa8647e01e5db3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 13:42:19 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle

commit b19af5b41c80d122dfa0e5ca4a61ef2e70549de1
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 13:22:42 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33862-master-1' of git://git.luns.net.uk/moodle

commit d8d2eebb446a4fd6cee5c3ecfeb13663854a6114
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 11:25:08 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign

commit f14651b6b1793c73245d0b8ac0119f172f7d2768
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 20 Jun 2012 11:17:01 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle

commit f189c540b9904602d59560dd5eb2f284d4594a6d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 21:52:27 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle

commit 5e3698fda0f0e92a140e2d1fbccf653201b7b557
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 16:28:00 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle

commit 139d3639c8709d3c27f29a9aa679021301867cf6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 15:39:03 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle

commit bb046e61b6ff4499c9488c6e81107984031a9dd0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 14:29:25 +0800
Tag:    v2.3.0-rc1

Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle

commit 34741af185965809a4f33417c7dbb53a0bbf7864
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 14:14:54 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle

commit c1ac8fa189cf1c129aa3b5bb450c50e87b868a22
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jun 2012 13:27:07 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle

commit 07384ecc8b4a97e310f76979c4107617c85c7bc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 21:33:26 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33818' of git://github.com/timhunt/moodle

commit 6855fec7fd42dbf5990052a5d34884f1377c394e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 17:36:03 +0800
Tag:    v2.3.0-rc1

Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle

commit 3248a1e1e45e173752e161a036f010315ee96832
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 16:08:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33794' of git://github.com/stronk7/moodle

commit f715dc3fd542721ce3be168b05217455b75500d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 15:35:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle

commit e73c1cafa1c3c46deca1e9cd7de01e361ab5b5aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 15:18:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle

commit 584c219edfedab733fd46fce17bafd63b2ebbedd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 15:07:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle

commit f418c54875880c16d06d984c86391cf640f14fac
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 14:34:35 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle

commit 2b5f4dbbca8a6ffd018e0472083a1dcafa04fa7d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 13:49:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign

commit 1eab24d1a4aeb7660509808b9c273bf2c7b23c7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 13:43:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33779' of git://github.com/timhunt/moodle

commit 53db3251dabd5eb63b6f1d22c04f48c2af38bee1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 13:28:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign

commit 728aee97676807ff367448e01bcde96c7cdaa3e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 13:12:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign

commit 8a7b0be11146bf2ba90b9891358a88e039317593
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jun 2012 12:17:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33327-2' of git://github.com/netspotau/moodle-mod_assign

commit ad9fa9712cd59a47c7b7651168d1145e27766107
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 18:38:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33756' of git://github.com/stronk7/moodle

commit 74ef0474fc3445a1cecfd79bfbe30e355ed952ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 12:14:49 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle

commit d25887d440201d567cf16437b30329664d0f1ad0
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 12:10:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle

commit ccd4972636fde130e2e4c59326ffddff6a9e6211
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 11:30:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle

commit f898b935af7efcb26883b11f8f463775d0c9a2d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 11:07:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle

commit 66d95860709a055ef185834888e3db52099a60e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 15 Jun 2012 11:02:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32279' of git://github.com/stronk7/moodle

commit d4401b964328016c4d11fe2c2c1ef6c94341b022
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 16:32:03 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle

commit 4585e6ac9888a502cc8ae4212cf28c717d0e0fce
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 16:23:08 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle

commit 1ae5eb704adf103c99c6ae9bcee82da86121c3d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:29:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle

commit 5ab8fde00e2877d53f9998b92e42a6fafec6fc07
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:25:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign

commit 745b178e42cf7a7b59f0d11baad3a11f36316a45
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:22:39 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle

commit a1394f429b5863244c184efddc97836ac3821d32
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:20:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign

commit 54588ca214cfc3c229ca041bfb0ec1bf5378e7c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 12:00:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle

commit cd925ac79bcfb9d8eb1204ee3dfbd3ce11e40eaf
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 11:12:21 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle

commit e46dfeb7fcb219ebb4be8899092b9ae12fa83ace
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 14 Jun 2012 10:27:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33400' of git://github.com/nebgor/moodle

commit 5c2bbfd6e9685ec47b3fd41ec9a8c5f902a1d0f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 18:00:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33611' of git://github.com/timhunt/moodle

commit 4413b48000bd89ba1b404df61e29ba4c38501bb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 17:45:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle

commit 52f2bb299593eb708d6a64264d563b53adc36911
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 16:39:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33611' of git://github.com/timhunt/moodle

commit dff798fd4aee606865893c4e4a260af8ce4bcd8a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 16:33:50 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle

commit 966f3a11e12d40d0c4047dbc3e4d4c95c9bf7fb6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 16:22:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33553_m23_portfoliostrict' of git://github.com/skodak/moodle

commit eb6afd93b97ac58e7f0a3b28001042ea72539e22
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 15:45:19 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle

commit 2333058eb07ca84c03a0b356468e0c837dc1b566
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 15:24:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign

commit 3aad3a5e64a443e5278d87af77beeb14717528c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 15:03:07 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle

commit 3292d9f0039300c5c81eb3c6b8d49c4c82bb869c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 14:08:36 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle

commit 1904310572393cf9a49a2c50312a815f4c1799c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 14:02:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle

commit 9379a9190dde1b64b1671372246169a698b7c1db
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 11:28:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign

commit 38569ad3a23ca6a33cca9743307b1128f466d931
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 10:12:21 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle

commit b9c871b18a215db1e56a1ad43d2b4963a610744e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 13 Jun 2012 10:07:32 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle

commit 19774b885d49d3f55f2787439c2a8dbfaa26bc95
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 18:36:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33676' of git://github.com/danpoltawski/moodle

commit 8409bd51f4d8857cdcb29cdb07e5f98c86854eed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 17:38:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33612' of git://github.com/timhunt/moodle

commit 93de786561570923d204d465997de4255b803944
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 17:18:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle

commit ac961e292a169578dbf7a9d418aaf2d26f49af28
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 17:16:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle

commit ee6b3604310614ea72b91cbb5dc2057b69947d8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 17:10:54 +0800
Tag:    v2.3.0-beta

Merge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle

commit 203d255116f12bf1596805349b3a608e22ea1f5f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 17:00:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33393' of git://github.com/timhunt/moodle

commit 82fc6ae6e3baab873b4d0e22d5ef04482358e85b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 15:57:58 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle

commit 071d8ea75b109af705cfc06a35214401fd54b13b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 15:55:26 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle

commit f3e526b859b1956a79b7776a44289f96dc344732
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:54:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle

commit 760c063bc070b3ae5c1b1cff4f0466517ef9ae02
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:45:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle

commit 08f5648de399cc1c7611accb70b3f3338a4e07be
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:38:34 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign

commit 14507142a1722a2365c7338e91cccafe956bc9d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:36:15 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle

commit 91f0dd438a99a91f2a9afe1fc6e9eb775d744aa1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:05:47 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle

commit 555099c66672816dbd095bbf3a1b0f8048967775
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jun 2012 13:03:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33400' of git://github.com/nebgor/moodle

commit 4e020fe71d6e04955cc7c2316e5ec5c514fc6c5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Jun 2012 15:51:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle

commit c9d7e6fa1641c28bdac569d7537dabb173ff0acc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Jun 2012 13:39:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign

commit 8ac226d23cc93f3dc95f09decc893ce2bdaec086
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Jun 2012 11:40:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle

commit 583c698ee1e7a203f8d95531426ad1909e8481ff
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 08 Jun 2012 10:36:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32783' of git://github.com/timhunt/moodle

commit 55244f85279ee8135c164ae4884dc6b18b01f70f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 23:15:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33577' of git://github.com/timhunt/moodle

commit 901f49097a15092f851f7e278cce7b193847073b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 22:23:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33532' of git://github.com/timhunt/moodle

commit 9c1fe3356f147beb2a276d3dd989b95ebb1c0cd3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 22:14:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33565' of git://github.com/timhunt/moodle

commit 3bc24f9aa784546f993a33689f05f2d0e837fc3e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 21:49:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33517' of git://github.com/timhunt/moodle

commit 620ecd38d242e21838fa9918f9c2c865f474403f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 18:11:10 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle

commit 644495114ee91aad38f3bf3a644b287edcf02c82
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 17:33:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign

commit a6eecb7c9d9938c44dfb884ac8c2ded7bedc4a71
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 17:25:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle

commit c9978ce67b085a90fd74a7ce6ead0ae5e76577b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 14:29:08 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle

commit 25f288f2fdf05e9a8da9b748bde56e90c24ffd1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 13:33:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33467' of git://github.com/timhunt/moodle

commit 2960a220526d07ecc2ddd5f3f3ebcb7efe766e6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 07 Jun 2012 13:02:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle

commit 79c2b50980f5b90a06efbff4c866f7ce34f92108
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 16:18:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle

commit de6a0dfd3d6b6e16b2ee4be0bbf2f35616086b03
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 16:09:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign

commit 7f04dd633fa9385af1937c3002c838e927b1ec88
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 13:20:59 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle

commit dcba513f4b875a26ee0a1e706b89a38343030d56
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 12:27:10 +0800
Tag:    v2.3.0-beta

Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle

commit c89331a4cae18ae56f88085d919b433a536d0508
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 06 Jun 2012 10:31:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33119' of git://github.com/timhunt/moodle

commit 469f4078c581bd0637f855e7920a3435a4c1ce83
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 15:32:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle

commit 2812b87babacaa3f54b234e46b29e8da30e91051
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 15:23:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle

commit c770311367bb2ec1ab4109d91ca86f00921c41d1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 14:30:40 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle

commit 66726f61d0f1065f1b95a5eaedb317e904af8532
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 13:10:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33502' of git://github.com/stronk7/moodle

commit a16757ed9c66814630bb78de66175c5b1155b924
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:52:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle

commit 8e9e62fd8e05270a10140e6f5641fdaf7cdd9659
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:42:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle

commit 29304b6c7d6a9247bd440399529d5d562b0035b7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:34:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle

commit 820b845415137841cfe08d6067efca740ae48e03
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:15:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle

commit 490ef893652188e301923cf0320a8442d679b044
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:09:44 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle

commit ac0ad29c6f082a7cef8ca28e45dfd6fd02374486
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 12:03:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign

commit d54020bf4c202c587de1a8b90836ffe856ec4afc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 11:58:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30880_feedback_property' of git://github.com/andyjdavis/moodle

commit f7091beef44d8193f1623db8e68dc53e0641f39b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 10:16:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33485' of git://github.com/timhunt/moodle

commit 7e5789c12ccbbf0228ae563ce970367b8492758a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 10:10:21 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle

commit 50bc155cce300ad044c06d3b6a03a5d63e5530d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 05 Jun 2012 09:33:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle

commit 1cf840074b269ee730c554d405cd895c979b1425
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Jun 2012 17:13:35 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle

commit f27735e470c8be9eea05a7dc8760b372784bf059
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Jun 2012 16:59:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33480' of git://github.com/stronk7/moodle

commit 6f337ea935261ad1d633d33cc39c7c76f214784f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 04 Jun 2012 15:55:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle

commit fe591d0d2452fe4a0f3266a602e76af0aa17b1ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 01 Jun 2012 17:01:41 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit c9bd01882586788bd0b9a713f9f13101c8356eb2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 May 2012 16:59:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33434' of git://github.com/stronk7/moodle

commit 9c6e153888ce020806408bd76ca8d5a9124172ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 May 2012 10:35:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle

commit 2605112e0b23a09e4c21f1f339329c0b39ae239a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 14:14:50 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle

commit d88f1a51fc2f8c924d4825b88b856569b3cf3362
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 11:45:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign

commit 7fd264b0d10917680232cb0a2391b90399c21151
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 11:35:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle

commit 0a16fa45ec6f73f063a2b1ecec841700c446a9fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 11:03:11 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle

commit 7e825533318881fdbbc93da0258771c023cb1cce
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 May 2012 09:38:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle

commit 076fbeb136a3675607064725acac06fc640ecdff
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 16:20:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle

commit 038c47f6e76f0543547a835679baf6c55c46e9cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 16:10:59 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle

commit 96601152f2456f6ba6e46240a819a9f917341925
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:56:28 +0800
Tag:    v2.3.0-beta

Merge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle

commit 02796eab6924b10d93571a3ad28761e2d9b1e10f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:40:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle

commit 786cd60ee3acf126ddae692e0efacb08412aa669
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:21:55 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle

commit 05d80ae6cd22975c9601d367d1795692b96a3a0e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:12:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle

commit 0ed8a933d626d1b45cbd96e2cd585f2194ecffc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:08:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle

commit 9856d05c26c992d8e760cc0351a8bad2cee84572
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 15:00:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle

commit fa31bfc1817c9f3931c52f444dca0fa8fbd56da1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 14:58:31 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle

commit e73b42ca57519f58d2ef9c7c5fb1e9f120ca3e37
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 May 2012 14:57:05 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle

commit f18dd15d3e3d85ea4e6d5fe50e1d60598c0d5271
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 16:10:16 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33321-master' of git://github.com/kwiliarty/moodle

commit da5cd8cee8c7c2c2e69feb0a48f0ee6a6d854655
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 16:03:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle

commit 995e479067db0a2aa5ecb505d5a453d9e8603df0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:43:33 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle

commit 830fdc8ce8e1561be341bb88b7fd8a06fdc4ac24
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:37:31 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle

commit ffec9bc70fe5a908952746d0a7f3401a6619986b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:23:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31393' of git://github.com/timhunt/moodle

commit 5ab310d5d3a8660f351a49c393917cb44eb3f17a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 15:18:51 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle

commit 0fe4db6dd106c8d3a9b5ba30f7e91699d17572ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 14:58:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle

commit c865e08fab61f74a297d991bf9ff371a80d583e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 14:56:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle

commit d079d6d8c13269bc4e19cf28b2ebe4c4a7d4bf52
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 14:54:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle

commit 3f1bca9d56598d64b43b62ea138cefe94688b930
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 14:32:16 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle

commit 193198187c116cd4c6c4bb44bad89d22cd0c9b47
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 13:01:44 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33347' of git://github.com/rajeshtaneja/moodle

commit 83ae05f620425dc035f72619d1356862aa3c15b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 12:16:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle

commit 131bd2f68f5c8025a903b55234b1206d753182b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 28 May 2012 11:47:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle

commit cc8801e33d6b68e3bf24abbcc906a1f4927438dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 18:04:43 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit e7b7cd5b98a8064222fa9818659f71d1fdc7d0f8
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 15:25:30 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle

commit c86d6be226b57250d7abe42a963da6da3536bdc9
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 11:14:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle

commit ccee3cd67f4bf145327aedd6b833c959addaabcf
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 11:07:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28557' of git://github.com/bostelm/moodle

commit 9a16bd17982b10f56490a37192d0d5a3a9e99c5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 11:00:53 +0800
Tag:    v2.3.0-beta

Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle

commit 588d3a7e1f39533d28365a524505a1adc7457276
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:55:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle

commit ada7dbd93ad9196dff0ba1b8a6eb9b4553bc1034
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:44:47 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle

commit 10a9d27d7462fb79852d1f1a9628e6608f22acb3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:37:48 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle

commit 8cba2bb747f7576572549a4bfe44f3a31a3c2ddc
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:22:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33028' of git://github.com/mouneyrac/moodle

commit 2ffd7f1824ef0034db7b4b1204eaeee380796b2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:16:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle

commit 8119141b91ea1bdad2b5881fd78558e7f63187e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:14:17 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33020' of git://github.com/timhunt/moodle

commit 494573dc43aa544c9db7aa242d20839c635b69c4
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:13:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle

commit 1e448fed272d29b1f9b173d14dea0818693c718d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 10:08:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle

commit 753199ba63f09d9d903bdc33841fccd1923b5f10
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 09:57:35 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle

commit 4b0992ca19c896ee3930c69ca5112c0ec7a67455
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 23:30:23 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle

commit 108526897d2c815bfadffecf56daa8449d89e4bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 20:32:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle

commit cf36df431686a5aeaf30613dcf2ad7d1d87a1eb3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 16:49:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33315_blog_rss' of git://github.com/andyjdavis/moodle

commit 0fb13aa3d8b45575d2b52953057650ed28623702
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 16:34:32 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle

commit 2625d99b52b2affc6fe902d47c32b75cf3ec90b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 16:32:32 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle

commit 77cb9b6ce65768ba3809440d01372d86d2381877
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 16:10:06 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle

commit 5c44b0355949b58eee08f4791555fc15eab0632e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 16:05:25 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33146-master' of git://github.com/abgreeve/moodle

commit ab1c1571a3816466de1f4a4f8dbe9fba9b0e6040
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 15:53:39 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33186-master-1' of git://git.luns.net.uk/moodle

commit 20005a0ed85f914abcf59373022557b15e5b8c9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 14:39:58 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33152-master' of git://github.com/abgreeve/moodle

commit 313514ec9b6ed8da77804f48d984792215286c51
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 May 2012 11:26:35 +0800
Tag:    v2.3.0-beta

Merge branch 'w22_MDL-33293_m23_revisions' of git://github.com/skodak/moodle

commit 419c47c74a344231c7ba2f1112b0f6063c4f3ad3
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 13:28:01 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-32155' of git://github.com/rajeshtaneja/moodle

commit d9038d715b307ed0b97c5f2bcfda6db9459ba8ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 11:27:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32338' of git://github.com/nebgor/moodle

commit f310b16d806fe804553ea407af1dcecdee98f952
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 11:13:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign

commit 91b24de2e5714a41707f1e15114fda5bb18e3679
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 10:39:16 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle

commit c14cad3167dfb4813f20c009836ed63a093ee05c
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 May 2012 10:26:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33074_groupmode_button' of git://github.com/davosmith/moodle

commit 198244e2d9ab65ab81cefcaf9690280b4c8e9580
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 17:14:43 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle

commit 37eba7d5d69123b1908fcc6e829219171ac30ef9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 16:51:33 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33149_stored_file_access' of git://github.com/dongsheng/moodle

commit 21878be7c8d479492737aea57e9e04096cca16d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 14:32:35 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle

commit afe23ae76a85d10b3c08544c84e24705526526c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 13:57:51 +0800
Tag:    v2.3.0-beta

Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle

commit d106cf1d7dba0ca597d9d8f60ca249ac78a333a0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 13:34:18 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle

commit b8644958e37b3b1fcbc6328cdf4c00565b1f9843
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 13:05:28 +0800
Tag:    v2.3.0-beta

Merge branch 'w21_MDL-32379_m23_forumcron' of git://github.com/skodak/moodle

commit 49f679032303c81f2213285eea3fe05d8b4f3a45
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 12:51:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle

commit f4e9103a95ddfed43ff2f781c17b026c491b76fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 12:28:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle

commit c1e15608438c276ccb88ed39ff30b946777e397a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 11:54:30 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle

commit 2a3ff9e8dfce7704e627d515627c9418396b0abf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 11:44:23 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33153-master-integration' of github.com:FMCorz/moodle

commit 3e832fe3e5c903fd40691ae12f1ffed863787d8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 11:14:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle

commit c8f0f2cd8505769244df595be2ab4741e5950342
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 10:30:36 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle

commit 5d6e603e1f6a31b37794fc10b31025735208ea42
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 May 2012 10:18:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle

commit f7290156ad938103532f00669f1e13e0e8b7486a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 May 2012 20:17:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33126-master' of git://github.com/sammarshallou/moodle

commit 2b4f1cbc32349357ffc3ab415dacfc02071a772c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 May 2012 18:19:32 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle

commit 5c50d45b79137038ce9487564d25b05fd0b90eca
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 May 2012 17:22:13 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle

commit 04acd266638222f9f569aaf5170189a572bb650a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 May 2012 13:26:36 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33079' of git://github.com/stronk7/moodle

commit 4a3d07972cc6c60ed8d2e26f6dafad0860406b23
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 17:40:33 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30617-master-patches' of git://git.luns.net.uk/moodle

commit ad10c481e14cee5bb36f199d7fa765352983a93c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 12:12:51 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33048' of git://github.com/timhunt/moodle

commit 82258830b7742808e702100a29956ccb13ad772b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 11:23:47 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign

commit a4d0f6f06a482fd1b76c1206e780eac2684c02e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 11:05:28 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32868_m23_iplookup' of git://github.com/skodak/moodle

commit 7e89cbe0ac3f18b3845599264e797a816bab3d8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 10:30:22 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle

commit 79f3d0e027fc64d2c52959a61d1e102052bed178
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 10:28:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32535-master' of git://github.com/sammarshallou/moodle

commit 33e693b5e133a97ea3266eb17a1b4442b23dc94a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 May 2012 10:05:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign

commit bc449b18a6789e769b3422634bcecaeada49052b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 21:19:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle

commit 03ba9dac9489f6c3e5eec342b0cedf62218c5923
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 21:04:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle

commit 1ed2dc6f96294c1ac8c553a53f3e857b6c4e1f4b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 20:46:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle

commit 6e0d17693445435953e9ead532dea836c45f169d
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 20:45:37 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle

commit 331a8feecf833456bc71df169a272dbae738dd80
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 14:33:42 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle

commit 5a0a64661c485cd6e153383c3ebffdec02e5da2f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 14:30:30 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle

commit aa141671a3cf3506d168aa62639820d541e4b671
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 14:11:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31814' of git://github.com/timhunt/moodle

commit b5378c11135ca0a3644b0817a2b68d1f7a3d2e21
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 12:35:45 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle

commit 65d0d4b654fce4537de7a2f4f2204f4233c6c876
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 11:29:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle

commit 12ba24a8f89fc73f371050bf1758fef7b69fa520
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 17 May 2012 11:19:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24419' of git://github.com/stronk7/moodle

commit 61bb4184a7530ad57194a0f6d12558d6263ca14d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 May 2012 15:41:46 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-25197_m23_innodb' of git://github.com/skodak/moodle

commit b60b839d31fc892ccb6ce716cf60d45c12924c0d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 May 2012 15:32:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32869_master' of git://github.com/kordan/moodle

commit 0a6202232ce308ff6abc937a38018db5a4cd7fdc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 May 2012 15:30:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle

commit 1e1931a7976c132394213091b380ea313bd50f31
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 May 2012 14:43:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle

commit 7a76aad7b7e2ba4d6d52e123c75393ae30fc405f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 20:57:14 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32930' of git://github.com/tmuras/moodle

commit 095de3cee635dace455443c0d8e3eaf691943dc7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 20:49:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32863' of git://github.com/jonof/moodle

commit eca95b639db39c98f769687c733d489a79282183
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 20:42:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32375' of git://github.com/timhunt/moodle

commit bdd773d56596cfc4e4b421b9bf9b3649d982ca4f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 18:08:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle

commit 225097f75a830f839a170a2b5f4910c4b207ae2d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 15:53:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle

commit a5fefe0bbdf95e8b429e3afa7bfaef75dca09df3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 15:46:23 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle

commit cf037ba049e34dbe8a3f771c3f9dac3fcbdad7e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:44:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle

commit bf9b08dd5e041e310094af687d7516cf45ae8a61
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:26:29 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle

commit ec3f19bddbe5cc87e01ac877e3aceca09306d7c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:23:41 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle

commit 8715472b1dc9dca40b5f6abd83325fb503b92aff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:21:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle

commit 1af542ed67a3be384268aec3b767493736695c7c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:20:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle

commit a225149c9ab8cb27b2f4d38d92d3a639bbcb6b7a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:12:30 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle

commit b728070f5d6b8437e4cd5f346f241bc99c3fe79e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:08:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign

commit 77acdb26f2a4c2eb050d5442c2a1085530881fc1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:06:37 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle

commit 783669b96b2e6538169610d0015f78763218273d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 14:00:51 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle

commit 3359a6fe07f019a8e62b92234668f350c6317119
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 13:36:11 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle

commit ae745307ef26128b57f5eb0e76ec3f0bcb6e9dc4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 13:32:18 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle

commit a271c57af8fc5a2f694d7c68f4a1192629294ff6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 13:12:53 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle

commit 950632673b5bd5e0c2c2a85f336715ea6234c6dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 13:08:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle

commit bb30328fe1faa810af34ff9f9fb681d2c8d579fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:49:52 +0800
Tag:    v2.3.0-beta

Merge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle

commit e87a7c65f168fd80bb6e8197001e9d550d3f31c2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:41:46 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle

commit 41ea0d3cc20081236975200e1bf64146aaf7de04
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:28:05 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle

commit 85c85b81024706c0c76552b59e490c04a6a4ed1c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:22:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle

commit 2edce32ad4caa715b4aeab26ac3476ae82416054
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 May 2012 10:10:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32910' of git://github.com/timhunt/moodle

commit 702cb399b22c34d053ab9dcff57aec42a7bb0cc2
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 May 2012 16:51:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

commit b84eb3cf205144d7b809eb8b08d5bee4f9afcb16
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 May 2012 14:24:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign

commit 33886490651281ffe93dae6e59100d97d83c0399
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 May 2012 13:44:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

commit 0dda790c05bcab5b57a624ac3f6b9c0229d1e47a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 04 May 2012 09:28:41 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle

commit 313cdd4fe4c01d4a1e65a04cb3424920807d4ae2
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 04 May 2012 07:30:45 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32757' of git://github.com/timhunt/moodle

commit fcbd37e38a01bdf7b60aac7f60b32c909d2074ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 04 May 2012 07:28:29 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

commit e50de8764bcf15571d0b178ff49cf1e51db656c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 04 May 2012 01:09:53 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32738' of git://github.com/timhunt/moodle

commit 59e430718aaad5ad46224838b106d2bf51fc181c
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 04 May 2012 00:58:00 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32740' of git://github.com/timhunt/moodle

commit f1e8e6adceb59d674b4a9d7af590b60c57775b7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 May 2012 21:23:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32739' of git://github.com/timhunt/moodle

commit 9b06d97381449479a840a7cfc6a1566d41f4c19e
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 May 2012 20:43:28 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

commit 08b5ac5aae0d3848eb697c5204d04709ef8e6c80
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 May 2012 16:11:00 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle

commit 875f2e459ebf5e0c0ab6f88c241dda7a491697c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 May 2012 13:26:33 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-31498-default' of git://github.com/rajeshtaneja/moodle

commit d5bf8f0ba30887d70e61a916ffd290b096fcc443
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 03 May 2012 13:10:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32689' of git://github.com/jrchamp/moodle

commit 307621dfcec2e4ab3c92ace640649c0c23e0d749
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 May 2012 18:01:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle

commit 0c3867109586cb4b897ce30159954520a7825b51
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 02 May 2012 16:54:54 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32657-master-2' of git://git.luns.net.uk/moodle

commit 6b445cb17aa6c1a6abc2ae439fd766e4d49b635d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 11:27:16 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle

commit 35a1c034482115ac83cbbd8725c8871b23c8a3a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 11:16:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27508-workshop-groups' of git://github.com/mudrd8mz/moodle

commit 3869858d3ed256a019d0d0cd0ee10704690c71dc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 10:59:06 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle

commit 73d595faf3778cb0cbdfd5de3d066b9146f5b6d0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 10:30:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32181' of https://github.com/ppichet/moodle

commit a4c9412b15d143adc0c1af4ce7e2be48961530b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 10:19:17 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/moodle

commit 94b9d44f2857dbd1be31c3af77bac2d48cb9856c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 01 May 2012 10:00:01 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32586_m23_glibciconv' of git://github.com/skodak/moodle

commit 06dcb573c475a81219bd79a88d1055a38031add7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 17:00:23 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle

commit bc24339e00f540ff55ea78731e310a85679b185f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 14:29:40 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32357' of git://github.com/timhunt/moodle

commit b53cb1294aa7960e119dbc1083084f5e6091f538
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 12:54:22 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

commit c1bb7a6f39f4d1c37090e218daeae353bf97f5b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 11:05:19 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-3030' of git://github.com/timhunt/moodle

commit e669ee3a963a0ed62acf75f5a409e778c8cde2b6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 09:50:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32627_m23_userajax' of git://github.com/skodak/moodle

commit 008655ca0415f4faa3d2972316e8a58d8912fd0e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 09:30:24 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32613' of git://github.com/timhunt/moodle

commit 81ea7349920d81d633ea04896004c15a142921a8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 30 Apr 2012 09:16:24 +0800
Tag:    v2.3.0-beta

Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle

commit e5055d3e5e74624c3621745adc9ef987270419e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 15:17:43 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32102' of git://github.com/danmarsden/moodle

commit 06f29d7d7699af61a5559c59a0d2350c4a3bc37a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 10:32:18 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-31928-master' of git://github.com/marinaglancy/moodle

commit 8e8f247f2c24cc4efbfe47585064339618e4f923
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 10:27:15 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32427_m23_protocols' of git://github.com/skodak/moodle

commit 1e77ca296d6a7522b97851b8035861303b42d86a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Apr 2012 10:23:14 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle

commit a0a87e85f08b5c9bd5de36962103508c178ae0a1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 16:35:26 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32477_m23_cloneperm' of git://github.com/skodak/moodle

commit 3bbfe7d63633eeef0fc779a6bf68075421d9c7dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 15:37:34 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32449_m23_tinymce' of git://github.com/skodak/moodle

commit 98fc9c836310a55ae8821dd6685fa159cf373f6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 15:25:42 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-31553_m23_clitimeout' of git://github.com/skodak/moodle

commit be7358bc180428d8e3817da4f55ac9027557eb64
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 14:25:59 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32497-master' of git://github.com/marinaglancy/moodle

commit 4e25e4696be1269a0f583251d287ba65f96d3eb2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 13:55:00 +0800
Tag:    v2.3.0-beta

Merge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle

commit b68eef5e0ba728021c06894f5624ced23b7cb31c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:54:01 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32462' of git://github.com/timhunt/moodle

commit 544cfe962ebe369a494f47f24feaa06e46382044
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:49:56 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32104-master' of git://github.com/ankitagarwal/moodle

commit e0ed91ba393bc9fa91b71243197fb6182b9e42fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:42:16 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-29262' of git://github.com/stronk7/moodle

commit fb1b14299a3dbe8aa6ed3ad08af99ed2603fb04c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:24:39 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle

commit e7e0f8d27f4ab0b1f8fe0e81588aba2126aa4ec2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 12:20:57 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle

commit bebf08315998407ecb39faf923221d378de01e22
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 11:47:11 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle

commit f48808810974ea3fafd297eefe8c18cbc8fb61a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 11:21:06 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle

commit eadff47811bd7d948e75f968f445c97d66ff0f8b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:59:17 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-29975' of git://github.com/danmarsden/moodle

commit 0439fed4d3b587912d6ddfca4907183317c2bf3d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:51:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30187-master-2' of git://git.luns.net.uk/moodle

commit 42b206e47ab7dfc2388b23bbe4f7df7165904848
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:42:42 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle

commit 75285aa03a5630ee403588ff46eea74078289faf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:32:37 +0800
Tag:    v2.3.0-beta

Merge branch 'wip_mdl-16646_master' of https://github.com/iarenaza/moodle

commit c6d2dca7a0127169fe46710b2a7b695c5f83dc1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:27:44 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-23647_master' of git://github.com/lazydaisy/moodle

commit d6dd4f40e157a844c12da67f6ed4757dcfe56126
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:25:54 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32451_m23_wikistrict' of git://github.com/skodak/moodle

commit a50a1b5dbffc89cf2a4fcac223354def656efc16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:22:04 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32512_m23_estrict' of git://github.com/skodak/moodle

commit 1d99324f38c93552dd862442fa6d1908b61ae8ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:16:27 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32451_m23_blockstrict' of git://github.com/skodak/moodle

commit c4974b077a347c34178794dd98aa9bd3d8ec3ee1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:09:02 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32576_m23_markdown' of git://github.com/skodak/moodle

commit 242c26e0632bfa329cc8cfc103b61ba084e7b503
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:07:07 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32575_m23_typo3' of git://github.com/skodak/moodle

commit 1c8be0eb7fe3fc923bf6b9157309c9fb3e47917d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Apr 2012 10:00:24 +0800
Tag:    v2.3.0-beta

Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle

commit d10a9ee4dfe7fb14e62d08f4a522797c2a7eb687
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Apr 2012 17:37:38 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit f0ab3a05e387f2a2e70daeab8f87f48335e537af
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 18 Apr 2012 18:30:03 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32377_m23_strcache' of git://github.com/skodak/moodle

commit a1618882544f453f84bc77679b1a2f8183a3f9f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Apr 2012 18:53:32 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30225' of git://github.com/mouneyrac/moodle

commit bb0bd8cb580f7ca96dae7ca7875e48481fb14eed
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 17 Apr 2012 16:29:27 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25660-workshop-calendar' of git://github.com/mudrd8mz/moodle

commit 74c7692265e7f6f163841da4bde9da4e336f5ede
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 20:50:21 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32437_m23_tablename' of git://github.com/skodak/moodle

commit 54e4d1b3a1215e7fbf0982aec72f05d694df71d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 16:12:35 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32400_m23_phpunit4' of git://github.com/skodak/moodle

commit aa4ebbe5f7fc59f253af4d52e20e3582973bded9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 14:31:07 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32358' of https://github.com/ppichet/moodle

commit db277985024c35929a53ca44edb999fac27d855d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 14:27:18 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31694' of git://github.com/mouneyrac/moodle

commit ef4965afe4d897c312fce11209beee96ecf854ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:55:25 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32396' of git://github.com/timhunt/moodle

commit 71504afc992db54f3e54c1c52015e306baf755f3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:52:50 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32392_m23_minversion' of git://github.com/skodak/moodle

commit 5599620feb76261521af6fb13d9664ba099799c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:46:03 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32438-master' of git://github.com/micaherne/moodle

commit 04b16edb6d5cc5a2f418c7af29164c08bfdc4057
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:40:32 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32434_m23_droptemp' of git://github.com/skodak/moodle

commit 2e70e457bdab6052c8686946b759e3e84d3b933d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:32:40 +0800
Tag:    v2.3.0-beta

Merge branch 'w16_MDL-32423_m23_flowplayer' of git://github.com/skodak/moodle

commit 788c5164aacdf7db0d3931305247e50d176f2f23
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:29:04 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32393-m23' of git://github.com/samhemelryk/moodle

commit 31aec26c183b9b48c3949c113b2fd871dcacac89
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 13:01:48 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32404' of git://github.com/timhunt/moodle

commit 20dcbbf26a105ff588acbc55f8bb80dee738b015
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 10:45:02 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32442' of git://github.com/merrill-oakland/moodle

commit 570d76c4566fbf0c84b28a52743f3b998bdb3b4c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 10:35:56 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32381-master' of git://github.com/marinaglancy/moodle

commit 85b0540605104a8fff1465e86a60788d4a19147f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 16 Apr 2012 10:32:09 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32395-m23' of git://github.com/samhemelryk/moodle

commit 86be24f5a63e7c33bc99b491a0b7198a4963bf25
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 12 Apr 2012 12:59:33 +0800
Tag:    v2.3.0-beta

Merge branch 'install_master' of git://github.com/amosbot/moodle

commit 7a1ed645873e21ad42b355edbcbd8a93d278b822
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 11 Apr 2012 09:32:58 +0800
Tag:    v2.3.0-beta

Merge branch 'w15_MDL-32323_m23_phpunit3' of git://github.com/skodak/moodle

commit 4a59665b9f4a8d412b439ef6fb9647f4af2aca5f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 11 Apr 2012 09:27:29 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32217' of git://github.com/ppichet/moodle

commit 3d83a9f5048d668b8c0b7e20064b4d30d568ced2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 17:42:28 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32300' of git://github.com/timhunt/moodle

commit a98ff41f1a08f1ffd57c753d58ef5acec15a41ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 12:04:06 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-27427-master' of git://github.com/phalacee/moodle

commit f4bd3cd6c93206f5b1d17d65eb2228a57bb14ba9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 11:34:12 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32347' of git://github.com/timhunt/moodle

commit 26932315f1e3df43a7dd885fdb43d854e4111cbc
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 11:25:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32299' of git://github.com/timhunt/moodle

commit 098312b1498a6cff11dd85229ba90000117e9ce6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 11:05:59 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30051' of git://github.com/rajeshtaneja/moodle

commit 2d74d8a612b04c9a6b77bd645ffac5f4972cd620
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 10:26:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32318' of git://github.com/timhunt/moodle

commit 4c8ec44828dc46092a06316db1a0cb2191664a6a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 10 Apr 2012 09:11:38 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-25801' of git://github.com/timhunt/moodle

commit a973d320f1c1090f9abfaa317a21c520c2a550a4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Apr 2012 11:17:43 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle

commit 4fe5849b72e84145b148c64de26459dd0c6e9caa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Apr 2012 11:39:14 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-mdl-30904' of git://github.com/rajeshtaneja/moodle

commit 1d40f283ce4db614d13893c6e9714db7e3124736
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Apr 2012 11:09:31 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32220' of git://github.com/timhunt/moodle

commit aefc7e28ff16fec09a7016604869321b0c0d479f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 16:59:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith/moodle

commit 8408d23c991df0d052e6255aed7066aca963fb0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 16:15:35 +0800
Tag:    v2.3.0-beta

Merge branch 'w14_MDL-32250_m23_simpletest110' of git://github.com/skodak/moodle

commit 6461e1482eb2fb4a51e36cbcc35d1840e24a0c31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 11:49:20 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32039' of git://github.com/timhunt/moodle

commit 69f45566021ff80457ca25cba9c44cc713d8c4cf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 10:17:35 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-32264-m23' of git://github.com/samhemelryk/moodle

commit 6e83ae36a8ee51ab738425fde58abeb51dff47ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 10:03:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32246' of git://github.com/timhunt/moodle

commit bec21793d204506bc12534a5f3343d05b3366019
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Apr 2012 09:40:09 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32201' of git://github.com/timhunt/moodle

commit 2511b0742a3695298d8216fe9723581c089909d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Mar 2012 14:46:52 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32028' of git://github.com/nebgor/moodle

commit 4767d3261111a175c1c70b847d6fa75deaacac86
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Mar 2012 12:37:08 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-30235' of git://github.com/lazydaisy/moodle

commit 9e1a4be29dfdebe60d2f7c114d5809d2e153c849
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 14:39:10 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-31775' of git://github.com/rwijaya/moodle

commit 113022e5595e357ec3f35368f5034926f6386af3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 12:23:15 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32172' of git://github.com/rwijaya/moodle

commit a05c669af07e34bbf5e2357982f08e66395b27c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 12:09:32 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git://github.com/kanikagoyal/moodle

commit 91216d5095f82df3e5898d71f1f59aaaffa4b63a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 11:28:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-27710' of git://github.com/rwijaya/moodle

commit 2ce1efb8ac840c7a9f8873d70b7ef01a573ccebc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 10:51:38 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle

commit 9efaab4949b14d9644168134a9ae734decea9052
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 09:35:49 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32176' of git://github.com/timhunt/moodle

commit fdecfdb3d3dac95dc98ac200ade93a27636ae9e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Mar 2012 09:26:21 +0800
Tag:    v2.3.0-beta

Merge branch 'MDL-32177' of git://github.com/timhunt/moodle

commit 727dac2f340f26df69c5b37ecd48f90367d4a8f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Mar 2012 14:51:40 +0800
Tag:    v2.3.0-beta

Merge branch 'wip-MDL-27236-master' of git://github.com/marinaglancy/moodle

commit 0a4660484cbe9e04563d98cd3f9bd37498c058ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Mar 2012 11:38:09 +0800
Tag:    v2.3.0-beta

Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle

commit d68c62fe124863bbab4e44fdc460268677bec8b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Mar 2012 09:25:47 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle

commit 149da7724b5bd27f2e546f198268f0881133c6cd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Mar 2012 16:40:28 +0800
Tag:    v2.3.0-beta

Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle