Git merges in Moodle 2.2.0 by Eloy Lafuente (stronk7)

commit 3fdc4d04148c55ac20d378fe5e2fd6f3e35df3cc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 05 Dec 2011 18:55:06 +0800
Tag:    v2.2.0

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

commit da78edea18f216a3116e86e5de876608eddb7736
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 05 Dec 2011 17:57:53 +0800
Tag:    v2.2.0

Merge branch 'MDL-30340-sticky-blocks_simplify_frontpage_ui' of git://github.com/stronk7/moodle

commit 0e92570cca1a1680a215bc2843e2397af790cb04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 05 Dec 2011 17:55:06 +0800
Tag:    v2.2.0

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

commit bf69e333fe1df27b295bb82755f911d4a36d909b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 03 Dec 2011 19:30:49 +0800
Tag:    v2.2.0

Merge branch 'w49_MDL-30538_m22_versions' of git://github.com/skodak/moodle

commit 6451a6b15c9cff6b6e7369495b99f81c1f057a9a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 19:04:08 +0800
Tag:    v2.2.0-rc1

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

commit 773d1ec56b3222c5801f76bd35298aa0d1dafc42
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 01 Dec 2011 17:38:40 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle

commit 5ac8e50b895175f0a1f5e311197b667de2864da8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Nov 2011 03:07:36 +0800
Tag:    v2.2.0-rc1

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

commit 457e9ab606d3dcdf8fb7e5a96c8e849d8f10ec77
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 30 Nov 2011 02:45:39 +0800
Tag:    v2.2.0-rc1

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

commit 2321e0d6616745d14c81b2496132ace6c606af40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 23:39:22 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30444' of git://github.com/kiklop74/moodle

commit 8192d3cf434ef218e5ca1db4626e4aac30061ed4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 22:54:28 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30435' of git://github.com/kiklop74/moodle

commit 82fb6d1a087a741d3154131072e27162d2ef2c89
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 10:18:02 +0800
Tag:    v2.2.0-rc1

Merge branch 'wip-MDL-30378-m22' of git://github.com/samhemelryk/moodle

commit 3654f38623d03bab92c80f03fcf909fc4fed14c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Nov 2011 03:18:43 +0800
Tag:    v2.2.0-rc1

Merge branch 'w48_MDL-30487_m22_filtertest' of git://github.com/skodak/moodle

commit 1ff31a54a2a169ed3f7e517aa84622a2bfd682d0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 28 Nov 2011 07:08:31 +0800
Tag:    v2.2.0-rc1

Merge branch 'dropbox-api-bump-for-master' of git://git.luns.net.uk/moodle

commit a22e233cbbf5da78ba5b9534a42fce82b9a91088
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 18:05:27 +0800
Tag:    v2.2.0-rc1

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

commit 66d8f36b9e2d7e15ae20a1c00dc2e6a855f3b752
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 10:22:09 +0800
Tag:    v2.2.0-rc1

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

commit 2afaf485cf5341b8f17fd049a38f06d6c00691c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 07:59:59 +0800
Tag:    v2.2.0-rc1

Merge branch 'master' of git.moodle.org:/git/integration

commit 0620787a17e06db937ca7880afcd8a1fea47cddd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 25 Nov 2011 06:44:24 +0800
Tag:    v2.2.0-rc1

Merge branch 'w47_MDL-27233_m22_restoreenrol' of git://github.com/skodak/moodle

commit c08a5622b8a4595960f1085fd69602f3482468ed
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 24 Nov 2011 06:01:27 +0800
Tag:    v2.2.0-rc1

Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle

commit 43fb30d652aa358fcf5cd1e046b08238b997315b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:37:37 +0800
Tag:    v2.2.0-rc1

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

commit 8ccbf8d1e5ad151ea9374d6df6e4179d3b17c403
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:33:39 +0800
Tag:    v2.2.0-rc1

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

commit 07a27990a09f5129033d61aa44e3603f2c75109a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:28:24 +0800
Tag:    v2.2.0-rc1

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

commit c897e4639c1b33ef3bb1c0f537b7076cdc30b68a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:19:21 +0800
Tag:    v2.2.0-rc1

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

commit 9002363b351bee130b0389aedd05e4f1d653484d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 20:16:04 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle

commit ab9dde2f97212ceda7f06bb209deac8c0bd0573e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 19:05:36 +0800
Tag:    v2.2.0-rc1

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

commit 48e74d2c10d8f184c9c8cf0ceeed6a2e39424a6f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:47:51 +0800
Tag:    v2.2.0-rc1

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

commit 1bb98bd7a4820a4ac3c58534c4bacdc4437dd031
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:37:34 +0800
Tag:    v2.2.0-rc1

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

commit 5535390c55240f82bd98828e3d0d97318feef1d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:22:50 +0800
Tag:    v2.2.0-rc1

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

commit 3a02133f3f86778d64a116fab7f560d6e15b782a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 18:07:50 +0800
Tag:    v2.2.0-rc1

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

commit a0d26f45f7366ee886697900ec4c5f968e8fbb15
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:06:18 +0800
Tag:    v2.2.0-rc1

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

commit 7722bb5df804b2c3843ed1698eb76198e7f52eda
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 10:01:50 +0800
Tag:    v2.2.0-rc1

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

commit 689461f4d82db4d8229b06e682982174efd0a53d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 09:00:53 +0800
Tag:    v2.2.0-rc1

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

commit 0f6cc7a7cc2bb6a140e313b2eae4648913d7c6dd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:44:49 +0800
Tag:    v2.2.0-rc1

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

commit ea46fcbcedff1a19b55749c52d473f9137ebe888
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:20:39 +0800
Tag:    v2.2.0-rc1

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

commit 1316fc8af9f5ac5590e979ef455ce8f74296a463
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:18:00 +0800
Tag:    v2.2.0-rc1

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

commit 8ea233e7ad934eebd491d83f440ac5e943a981c2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:11:01 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle

commit 7242b051ac5b58365da5fe7d39494681cc4927a0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:07:44 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle

commit c8a82fdbfe1fe2ee5f5c64e5cab06b0e9fcd41ee
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Nov 2011 08:04:29 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle

commit b8ba54a408f2f0f693a19d5c46d9fb5fece3f6b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Nov 2011 08:50:20 +0800
Tag:    v2.2.0-rc1

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

commit 2b72f6dc62191f0be3502be530af32da7cfbc032
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Nov 2011 02:42:20 +0800
Tag:    v2.2.0-rc1

Merge branch 'mdl-23006-xmldb-missing-strings' of git://github.com/sbourget/moodle

commit 6b532f5d4df5a73e3243cae10baedabf58eabff8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 09:30:19 +0800
Tag:    v2.2.0-rc1

Merge branch 'w46_MDL-30147_m22_tablenotexists' of git://github.com/skodak/moodle

commit 27e5ce8b9f6dd0fb29324bb3e1750683c2bec85f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 09:22:40 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30328' of git://github.com/scriby/moodle

commit e5235e6eef981fc11fb8cf1d38f60d45808c5d08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 09:03:51 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30326' of git://github.com/scriby/moodle

commit d167cc3397c8d84f8c71fa8f6203e0ff21c9ba7e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 08:48:52 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30354' of git://github.com/scriby/moodle

commit eba4bcb441890ea14fe80a430bbb6cdd5e4528e4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 08:45:37 +0800
Tag:    v2.2.0-rc1

Merge branch 'master' of git.moodle.org:/git/integration

commit 695f327a70d1acb08edcf45738199a72bdffdfe8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 08:17:06 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30343' of git://github.com/scriby/moodle

commit 0fca3dbbce1994678222690d27cb7dcf8968afa1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 08:11:54 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30341' of git://github.com/scriby/moodle

commit 8efcee5f8c9333cafee40dcdd4c6de6eff8a848f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 07:58:12 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30295' of git://github.com/scriby/moodle

commit 34087d7be2322b2022d142ccd8cc2a0b6a266fca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 21 Nov 2011 07:50:32 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30339' of git://github.com/scriby/moodle

commit f218cdab344da12aa76bf1d5d0d53ea3487a0061
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 19 Nov 2011 00:28:53 +0800
Tag:    v2.2.0-rc1

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

commit 3a2927081c6026df4bf2e1507f6b7b264235313c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 20:40:16 +0800
Tag:    v2.2.0-rc1

Merge branch 'MDL-30290' of git://github.com/scriby/moodle

commit d9f29754133d31c79ed135e48d9e2358af919432
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 08:17:52 +0800
Tag:    v2.2.0-rc1

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

commit 408ea3b5470107f4f6c3f071a5317676445a331f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 00:15:00 +0800
Tag:    v2.2.0-rc1

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

commit f71e41691aadf938eab49314de5f0d5181e4d0c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 17:53:56 +0800
Tag:    v2.2.0-rc1

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

commit 1f40b7e25246d8c09151bd873075830d27f6a817
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 08:22:22 +0800
Tag:    v2.2.0-rc1

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

commit d647c2d60884f9109308915dbd4fe9c9fcc8777c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:45:00 +0800
Tag:    v2.2.0-rc1

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

commit e929eb035349c7e8ad57ec03cb0b9583ae45e67b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:33:54 +0800
Tag:    v2.2.0-rc1

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

commit b22dc5374ceac6ff1213c6e9a04e7cf6de7266c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:29:18 +0800
Tag:    v2.2.0-rc1

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

commit e5bac3491a9219163ec24dc4f7f1e96796d77787
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:18:25 +0800
Tag:    v2.2.0-rc1

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

commit 2c9073ab2a48495221b03601f9c82ab782b2d4a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:11:29 +0800
Tag:    v2.2.0-rc1

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

commit 0918488decebf235778bef1b4a2abfeaca248fae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:08:18 +0800
Tag:    v2.2.0-rc1

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

commit 85e013ef79e6bc25eb45f853ffa266d4de67fbe8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:05:45 +0800
Tag:    v2.2.0-rc1

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

commit 7f8dc336aab81f7d1936c3ee40b5e8f0c2038f3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:02:02 +0800
Tag:    v2.2.0-rc1

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

commit 69f9e7f3e48102052b3024da68075033ba88e493
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 07:00:12 +0800
Tag:    v2.2.0-rc1

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

commit cfaa2bd7441aa3ad4579961f9434b95188c77c1a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 05:51:51 +0800
Tag:    v2.2.0-rc1

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

commit 2fee72e19b20f34582090543986f5e4af0a2bc3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 17 Nov 2011 04:29:25 +0800
Tag:    v2.2.0-rc1

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

commit b51c46fc1a5117bf875c318953cd6af486c0c014
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 15 Nov 2011 17:54:40 +0800
Tag:    v2.2.0-beta

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

commit 8d78644bcca8417f57c84692256f8cc63f63c76f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Nov 2011 19:37:43 +0800
Tag:    v2.2.0-beta

Merge branch 'lti' of git://github.com/scriby/moodle

commit da2e3c12dbe03959219b7184e59d28c28d1c4e32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Nov 2011 02:35:13 +0800
Tag:    v2.2.0-beta

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

commit dddfaa73cb5fb9df0b5b03e8a0b64728a0751c27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 22:47:33 +0800
Tag:    v2.2.0-beta

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

commit 0852418307f8f82b51942dc458a82ae88e10a17a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 19:54:11 +0800
Tag:    v2.2.0-beta

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

commit 8ac9d33f492f41897ac561c0eb92daf6a9b5d7e7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 10:37:55 +0800
Tag:    v2.2.0-beta

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

commit 032bfca82a871266a620046e7eb0b799856e4ee8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:42:40 +0800
Tag:    v2.2.0-beta

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

commit 509361cfde22184d11160e90c73e0a23c0e45117
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 09:31:21 +0800
Tag:    v2.2.0-beta

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

commit 06b3d9c8c09d2590ef3781af27ccb1cadaa112fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 07:20:13 +0800
Tag:    v2.2.0-beta

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

commit d59df6582bd4c1b5a85a0907d76ac6e2b28da8e1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 04:54:36 +0800
Tag:    v2.2.0-beta

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

commit 47c6991a8e287b961f2b685360460b83f34b4cc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 11 Nov 2011 04:47:22 +0800
Tag:    v2.2.0-beta

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

commit cff6d78a7b3d0efeee0432e309590c684eab0591
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:58:57 +0800
Tag:    v2.2.0-beta

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

commit b01095d1e08033baf0e7c045cf7977a73a55bd48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:49:56 +0800
Tag:    v2.2.0-beta

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

commit af85aa7bb6fb0ed2442b83d3e732bd0f4980134a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:43:07 +0800
Tag:    v2.2.0-beta

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

commit 9fc402e47d2b4ff6f75119cd24e736c962902060
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 08:32:01 +0800
Tag:    v2.2.0-beta

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

commit f3bf5eba51cab174422bd705e4eb44a335e05ebc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:25:45 +0800
Tag:    v2.2.0-beta

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

commit 3c37f0adbc4684b8d600da3f698507ad34a690ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 07:22:13 +0800
Tag:    v2.2.0-beta

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

commit 7ca578dea9910076d23d43ae7f044ec8e2ba630e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 06:59:02 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle

commit d64cb2fb73b9e3b534b5249ff2e647f29589cff8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 10 Nov 2011 06:47:01 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle

commit ff64599f25075f2c389ef8aed7f531819d4d50c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 23:35:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle

commit 3fa5cb0beae783ce80beee184607c755ac3912f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 22:55:07 +0800
Tag:    v2.2.0-beta

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

commit c4bdf6b2d4394baae921016ea78c1de196cff645
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 17:05:40 +0800
Tag:    v2.2.0-beta

Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle

commit 7654b7bbc19ceaeea9706e604738eb1d1bb689b5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 16:43:18 +0800
Tag:    v2.2.0-beta

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

commit b7830daba1f9b3d6f393d03bcabcca32e9bf3abb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 09:20:26 +0800
Tag:    v2.2.0-beta

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

commit 0a9ed36c9e533fc3c5987ca131cb7b702f50cae7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 09:13:38 +0800
Tag:    v2.2.0-beta

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

commit ec25a72c4d917ae3773fab2cfb1f695b2ac80258
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 09:03:25 +0800
Tag:    v2.2.0-beta

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

commit df087b865b41bc5b407383b120f5834ebbdddea3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 08:34:08 +0800
Tag:    v2.2.0-beta

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

commit 253b3231b9077894c008d4908ef1b81cc1b12da8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 09 Nov 2011 08:20:06 +0800
Tag:    v2.2.0-beta

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

commit 77c5a5901765bb6edc5bf17685bdd9ef071c001a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 03 Nov 2011 02:48:26 +0800
Tag:    v2.2.0-beta

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

commit 5fbf87c802917514d33800981752af62f9903944
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 03:12:45 +0800
Tag:    v2.2.0-beta

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

commit e686d112572726ccd1d23baa244cd5960415fecb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Nov 2011 00:23:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle

commit 302f45e8de7f7e0510fe5715ab45b2d108b1b5b3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 01 Nov 2011 19:26:31 +0800
Tag:    v2.2.0-beta

Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle

commit d2822153b00abeff7576aee1eedbb2260df0fe4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Oct 2011 00:48:55 +0800
Tag:    v2.2.0-beta

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

commit 85819105a66247852c5eee9b9512907c0398edbd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Oct 2011 17:40:01 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle

commit 10dd4995da38ccd859b14ad72b6b7e1a90aeb60b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Oct 2011 16:33:37 +0800
Tag:    v2.2.0-beta

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

commit 036f27a4209aaaf6b15a32c96983b2bea8eaf610
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Oct 2011 05:51:10 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29670_m22_croncleanup' of git://github.com/skodak/moodle

commit f65cd7f46cb768cfa7372e59b93ed260d1d115f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 23:47:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29918_m22_accesslibdocs' of git://github.com/skodak/moodle

commit 35454bd55d064ec8cc2d13c1fbd9106b31f1dd50
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 23:43:51 +0800
Tag:    v2.2.0-beta

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

commit 94da1daf400ca2e6827dfc28eba35d5e25983cdd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 22:41:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle

commit a7fc769154954c987bb058d58cc111d805204e0c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 22:34:04 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29914_m22_codesniffer' of git://github.com/skodak/moodle

commit 980dfc57204c33508455d31ef70e4e8d10ba025a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 22:17:40 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle

commit 1bf0076e83ba3cc802b74aef6059a740ed4af80f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 19:27:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle

commit 9bfe68bff8e2bc20dbca5d57bfe1ebf0259b52b1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:53:51 +0800
Tag:    v2.2.0-beta

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

commit dc83f5b0060d5b12f379a42752d6e642c798962e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:42:48 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle

commit 4ecbf079b579c6da58a40d4922a79cab69d11ff8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:21:09 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle

commit e1595b32dcc3c98fcad067377ebd8dd20b122a4c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 07:01:10 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29863_m22_extendsorder' of git://github.com/skodak/moodle

commit e4950b6cf087decdac0f9b4684208a7b923c0370
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:14:31 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle

commit 1272091a6c056d8e4e259dde90dfa7e290a1504b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:04:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle

commit 918ecf1754fd704ef22a7602a8e2e05f7ce2560a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 05:03:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle

commit a4f6cc2fc71083e18703e533155962cde5567d4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 00:25:52 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle

commit b64188cd974d446b3347160e4b6c8e5dacee636a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Oct 2011 00:03:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle

commit e9296e6177f23cfda1d12bac516916f7aaa52249
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Oct 2011 23:50:27 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29885_m22_csshover' of git://github.com/skodak/moodle

commit f3b6463506b0a30db7eed769d9345bd4aafa636f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 24 Oct 2011 22:51:53 +0800
Tag:    v2.2.0-beta

Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle

commit 4b8a3a7b416cdf1aae1a9eebf4b00b1eefb8ddbc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 20 Oct 2011 00:41:14 +0800
Tag:    v2.2.0-beta

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

commit c2551ed593e5c958e4467269c0e9ee406c9495ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 19:15:13 +0800
Tag:    v2.2.0-beta

Merge branch 'w41_MDL-29602_m22_accesslib' of git://github.com/skodak/moodle

commit 92e0466957b5a5f8e8049c2db5799a0c382587ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:22:15 +0800
Tag:    v2.2.0-beta

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

commit bca8b79e2ab91c7e0840ba7fde4d8a4485622df6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:08:15 +0800
Tag:    v2.2.0-beta

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

commit 36903cece3f45491719db1440ee4c254e4480d6a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 17:00:04 +0800
Tag:    v2.2.0-beta

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

commit 065d6d80a24b82423e6ddb382b39695887b7c7c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 07:44:58 +0800
Tag:    v2.2.0-beta

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

commit c6015af28072984969d9126ad1422b8fdb1b6919
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 07:35:34 +0800
Tag:    v2.2.0-beta

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

commit c78238f1517921ba1aa1c0118cc408f4cb92876a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 06:58:09 +0800
Tag:    v2.2.0-beta

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

commit ebb9cd230be52b8d77f7f5e9e54afc9fb6a7b0d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 05:09:03 +0800
Tag:    v2.2.0-beta

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

commit cb284e953cefa6ce66750ce3fee238422c38f5ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Oct 2011 03:24:39 +0800
Tag:    v2.2.0-beta

Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle

commit a598a8d4b1746d7d01f825958c2819258a5cd52d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 18:05:05 +0800
Tag:    v2.2.0-beta

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

commit e02ddb9be864d55d5a36212bb6a5c0095075dfa4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 03:16:38 +0800
Tag:    v2.2.0-beta

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

commit 6966fea5f8386c60f9c0c3fdf1e4f3ddcb3655f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 01:21:57 +0800
Tag:    v2.2.0-beta

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

commit 3452a2db900a22c1da0ca978797e3d62f81ce614
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 17 Oct 2011 01:13:00 +0800
Tag:    v2.2.0-beta

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

commit f3c34143f962fb622bb60afadc1fc994849ca29e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:46:18 +0800
Tag:    v2.2.0-beta

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

commit 28a01625f0c8a26b7d40c022aa3c933597b37781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:30:45 +0800
Tag:    v2.2.0-beta

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

commit 29fb2bcc39f7f89bab6be26ac576cf7c086634db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 16 Oct 2011 23:23:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle

commit f6e1809608d02eb81f6518273a5ae99990d9f240
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Oct 2011 18:10:51 +0800
Tag:    v2.2.0-beta

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

commit 897015a0ebc1737731cadd2ed7d12171552c1a3c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Oct 2011 06:04:52 +0800
Tag:    v2.2.0-beta

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

commit 202c2032fab6b385828c82d2b88782867f0b020c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:13:57 +0800
Tag:    v2.2.0-beta

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

commit 7eaca449326d97328aceb9af757b6ae87e72ef35
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 07:10:03 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle

commit cec6a15b996fb7a3ee45805f7606523db356cc65
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Oct 2011 05:34:15 +0800
Tag:    v2.2.0-beta

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

commit a361676b221a93618fdba3e5940a8e242d944b53
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:42:32 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle

commit 66f7705daaf31c562cb9a4f7fe01d79248b367b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:31:34 +0800
Tag:    v2.2.0-beta

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

commit cdee9bd4f61f3de794db67360f902bd80ee1dac2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 18:12:08 +0800
Tag:    v2.2.0-beta

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

commit c72cf85f175578b54f7804247ed0108fa353446c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 07:11:20 +0800
Tag:    v2.2.0-beta

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

commit 38697ad4aaa0aec6b4e091867876a331742620d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 04:52:55 +0800
Tag:    v2.2.0-beta

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

commit 92c9bc61279e10dc170641b8e534a99cc8ecf212
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 04:50:18 +0800
Tag:    v2.2.0-beta

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

commit eefebc2edb3e71b1e298d46b3178ab5674f6aa64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Oct 2011 03:42:28 +0800
Tag:    v2.2.0-beta

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

commit 35aa80d166741349e3d76ecdde6bf042225ab341
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Oct 2011 07:06:15 +0800
Tag:    v2.2.0-beta

Merge branch 'w39_MDL-29555_m22_yui341' of git://github.com/skodak/moodle

commit 3babb0f5ba9e48403ac4f87bcf97f06397684823
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 28 Sep 2011 17:04:07 +0800
Tag:    v2.2.0-beta

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

commit ce05a13d83c99b0beb424fdf65f633c18d26b60c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 18:12:57 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29533_m22_yui341pr1' of git://github.com/skodak/moodle

commit 01b4e0016146ab3de3f66350eb0ec21a33790246
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 07:52:23 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29509_m22_admintool2' of git://github.com/skodak/moodle

commit a0688126355cc074e7ea287ef60808bf2aeabd0e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 07:02:51 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29504_m22_plugincallback' of git://github.com/skodak/moodle

commit bde5c82a20a84c4cd2c71152afe2536e2e87d234
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 06:45:45 +0800
Tag:    v2.2.0-beta

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

commit e1357975869d6b769828dc15ddfed8576ec162a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 06:00:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle

commit c430009676b285704712a5c97cd0b5b8b052ab1c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:40:32 +0800
Tag:    v2.2.0-beta

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

commit e75f06d9ecba892665f96aba68751c52b2424081
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:27:00 +0800
Tag:    v2.2.0-beta

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

commit 8374ca3c5f64fa4f801795d88dafb4657c1436ce
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 04:10:52 +0800
Tag:    v2.2.0-beta

Merge branch 'w38_MDL-29533_m22_yui341pr1' of git://github.com/skodak/moodle

commit 1a8ab39b3c3d790e021ff27cb9f134b64b3f3fb2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 03:47:40 +0800
Tag:    v2.2.0-beta

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

commit 789e95dddeffb93da880d3dce557baa8f8b5a903
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 27 Sep 2011 03:43:57 +0800
Tag:    v2.2.0-beta

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

commit 0e89333992868fd648c9da3e518ef12012e8d2ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 21 Sep 2011 06:10:30 +0800
Tag:    v2.2.0-beta

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

commit 8974d17a8f01baf581f832e60d15ab2c56bd9e8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 15:50:46 +0800
Tag:    v2.2.0-beta

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

commit 3eabe0ccd5135ca46a5e9ef8cda164e93fdefa57
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:17:20 +0800
Tag:    v2.2.0-beta

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

commit 3ff38c0e9ca4aeb8e1a9915dc0124891fae2d9af
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 06:03:46 +0800
Tag:    v2.2.0-beta

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

commit f1ac51ac60ed5a9821524c526c1a87bc2d7550df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:56:41 +0800
Tag:    v2.2.0-beta

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

commit 93eb27d4c00109b31cad6ed37d47cb190771a915
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 05:38:07 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-29126_export_separator' of git://github.com/andyjdavis/moodle

commit 9d8d55a00e69c5a2792e735a141fd1f728b8f6c9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 00:26:55 +0800
Tag:    v2.2.0-beta

Merge branch 'w37_MDL-29029_m22_admintools' of git://github.com/skodak/moodle

commit 3d5bb9115deaf6b8e385354829de957cdfa30bcf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 20 Sep 2011 00:09:47 +0800
Tag:    v2.2.0-beta

Merge branch 'w37_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle

commit ab545ab55e3d35dc1c5887e83e072852cc0ea144
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 19 Sep 2011 17:58:37 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-29185-master' of git://github.com/samhemelryk/moodle

commit 6c4319d46aac52d1362f1b044df4a0587f995e6a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 16 Sep 2011 07:34:18 +0800
Tag:    v2.2.0-beta

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

commit b7aefc8de597cd7ca632977b3419d1093cd0ad54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Sep 2011 17:23:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle

commit 847c66f5fc84e564c8a5a37c75b0b017fe8d19e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Sep 2011 17:20:19 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-28455_m22_tinymce' of git://github.com/skodak/moodle

commit cdcb1b9ea16c504c93eb2f0601a2dc26f2a645b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Sep 2011 06:28:56 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-29093-master' of git://github.com/samhemelryk/moodle

commit 3afd493065bb9e938ab6af60d8784c208600c1de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Sep 2011 23:33:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29326_m22_sqlsrv' of git://github.com/skodak/moodle

commit 7cf74711006afe1b9622fc129af5106f8b317972
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Sep 2011 23:28:43 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29328_m22_adodb' of github.com:skodak/moodle

commit 60bf24f02420bd96c12585d72376f2ad856c4f99
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Sep 2011 23:24:48 +0800
Tag:    v2.2.0-beta

Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle

commit 452b166526ccdc8472a605bb655fb144128a7df9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Sep 2011 03:59:38 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-23534-master' of git://github.com/samhemelryk/moodle

commit ce9d0673d0ea709f3fc1ea7eb4425777c8d1fb32
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 13 Sep 2011 02:37:24 +0800
Tag:    v2.2.0-beta

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

commit 4a94d2c61fd4402715b11852b46b90c50ba1dd28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 21:50:26 +0800
Tag:    v2.2.0-beta

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

commit d09ca89642cea4dcaf7ad42b67d6fa3289a1e33e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 19:53:34 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28043-master' of git://github.com/samhemelryk/moodle

commit b49c28aab3da35e645bf20bec9a0ca227f2f6974
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 19:02:33 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28599-master-r4' of git://github.com/samhemelryk/moodle

commit dfdb0051e7f2f948defe9ca074ca8837cf52763c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:59:20 +0800
Tag:    v2.2.0-beta

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

commit c35fba98da8fa0d6c64eac3f36baf7cc70ee4e1f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 07:25:05 +0800
Tag:    v2.2.0-beta

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

commit 4df93d22becf26bf7d2e2546d6a660f8dd81bf39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 06:38:10 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-29006-master' of git://github.com/samhemelryk/moodle

commit 49873b7e4396cab37811fdd2cb1b78aede052397
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2011 03:51:44 +0800
Tag:    v2.2.0-beta

Merge branch 'w35_MDL-29145_m22_imscpregression' of git://github.com/skodak/moodle

commit 2c1f86678cfbccef5b438cb617e41bb99f4d33c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 31 Aug 2011 07:29:22 +0800
Tag:    v2.2.0-beta

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

commit 0c4a35b2f40f363a523f0df9a68b35de64d44174
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 19:29:58 +0800
Tag:    v2.2.0-beta

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

commit bae0925b4d0b0d824d729663c2d3911283cc5845
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 19:00:21 +0800
Tag:    v2.2.0-beta

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

commit 1d6d2c91d278b945f83333eef6557a354257ec8f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 16:23:22 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-24202-master' of git://github.com/samhemelryk/moodle

commit c01a24bdefe93f8a53de785d521932dc7d6e5fbe
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:25:41 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28943_manage_message_name' of git://github.com/andyjdavis/moodle

commit c45eca3f0683e82f47118bb1f88a203d9ffe4880
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:22:02 +0800
Tag:    v2.2.0-beta

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

commit 0312bf641c7ea62837784cee3c3c154aefdb50de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 09:15:25 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28596-master' of git://github.com/samhemelryk/moodle

commit 18c8de5806bb76540000c5ff88981d9916955d55
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:52:35 +0800
Tag:    v2.2.0-beta

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

commit 52d935de274a6c2273de30eadaf7e56aa9a064ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:39:42 +0800
Tag:    v2.2.0-beta

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

commit 6843dea2e9d2e1960592075f40cb0a2bf8240c29
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:04:46 +0800
Tag:    v2.2.0-beta

Merge branch 'master' of git.moodle.org:/git/integration

commit 1343d181aef56783bb20b60077c7950130879002
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 08:01:37 +0800
Tag:    v2.2.0-beta

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

commit 1f03315b182f5bd70e72d6d8ba2660f281a3aba5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:30:37 +0800
Tag:    v2.2.0-beta

Merge branch 'wip_MDL-16168_HEAD_CAS_crash_if_no_LDAP' of https://github.com/iarenaza/moodle

commit 7795ad41b3780883d1b1a5a03a809a88a2e75dd0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2011 07:22:22 +0800
Tag:    v2.2.0-beta

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

commit ab2da3f679bfdf4f0db05d9fea331a2415888995
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 26 Aug 2011 20:56:34 +0800
Tag:    v2.2.0-beta

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

commit 50dabefeefbf3aa70d1f4fa3d365137c2ad04fac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 16:45:43 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27823_bulk_messaging_2' of git://github.com/andyjdavis/moodle

commit dc7ed03214222f1021348de01cdbc7ae42594d4b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 07:30:41 +0800
Tag:    v2.2.0-beta

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

commit 85dca0996e10c80e9e87692bae159d8fb8bfbb07
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 07:11:15 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-MDL-28650' of https://github.com/mouneyrac/moodle

commit 4f7c38660a54f562a4ecf62dba1e175b6b983c63
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 25 Aug 2011 00:49:05 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29027_m22_textlib' of git://github.com/skodak/moodle

commit f04da0f051d8474efdd63ebc4c4f6dccb6d27f08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 23:08:31 +0800
Tag:    v2.2.0-beta

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

commit a3f2ad4e80906e122f1a3c34ff8b890a12329e5e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 22:24:21 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle

commit 07ad6c600ca25abfc4390eb97a650fea65cc667d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 22:12:19 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle

commit 0a4ca115b247f4cd802c83e7cdc171c528aef6c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 20:06:22 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle

commit ca5c3667cd8c6b4774a9af13bc119e8ead6f8a96
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 19:31:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle

commit 2ed28439f64adae73dc7ccb096557ff844508881
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 18:57:16 +0800
Tag:    v2.2.0-beta

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

commit a2e87acfc5ce16f8b8686d98e72ae70d040dd3c6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 09:50:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle

commit a7493463d196cf5b3ef91710ed98889c33ea02c1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 09:39:23 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28248b' of https://github.com/totara/moodle

commit 55cbc6388212c17a7e12ef9658771ec61ae558ca
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 07:55:45 +0800
Tag:    v2.2.0-beta

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

commit 64ce7fb6c56b3fe389b4f398e4c4d8a609924e72
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 07:44:02 +0800
Tag:    v2.2.0-beta

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

commit f622fbef7f1ddc11939e946867a11ac0cde3b0f2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 07:17:28 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle

commit 5f37fcf861f01270909d67b61caae98b7630eb0f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 06:56:46 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29000_m22_forgetcase' of git://github.com/skodak/moodle

commit c8f74cc6280dba6caf45f8d1f9ded3e49402565c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 06:52:56 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle

commit de1c2d8322a2747e81f2fca8dbb239aaa2eacd27
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:35:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-27228_m22_labelhide' of git://github.com/skodak/moodle

commit df1271341545744a1c4d0420efb1feacfcf9f251
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:26:06 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle

commit 94fd5ebc0659eb601976cfab31e997b8d89c545f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:16:29 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle

commit 3a6cd081e41dff1bd214a1eab1097ba42c9a3008
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 05:12:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle

commit a4a6279a61bb21a8f2da02f277b52f15bd23820e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 04:50:03 +0800
Tag:    v2.2.0-beta

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

commit 53ef01d00b73606f16c416986c9a119b45e2b295
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 04:46:17 +0800
Tag:    v2.2.0-beta

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

commit 379771a72355649c2d8e008778706cbd6fa3cf21
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 01:04:44 +0800
Tag:    v2.2.0-beta

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

commit 4a88ad2f2a711e556e2defd76b1c8512898be4a1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 00:31:01 +0800
Tag:    v2.2.0-beta

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

commit 8d30b1a97e8f7f21db74fb32f73f68fa2eefcecc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Aug 2011 00:00:51 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28957' of git://github.com/colchambers/moodle

commit 01fc2855797fba9c106ca74d63184a5e00540728
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 23:17:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28397' of https://github.com/totara/moodle

commit 065399a11f0231f216f386badf8e8fd8b10607de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 17:03:19 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/moodle

commit 4abd7a07e1972af0ad38fb70b453fcf973e5eca9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 16:41:17 +0800
Tag:    v2.2.0-beta

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

commit 6c29e785eb6e6255f180a777d733177cbe370986
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 16:11:41 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle

commit f1bb5b2ec71da8cc50d6d66f5b43e2d5f16271d7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 15:59:27 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28935_m22_calendardays' of git://github.com/skodak/moodle

commit c946644435d63272aa43dde2ffeaadab189b4d75
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:49:40 +0800
Tag:    v2.2.0-beta

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

commit 906f11ef3b5a7237c820991619ae45e26db1015c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:42:40 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29016_m22_distropermissions' of git://github.com/skodak/moodle

commit 1a3c27d0b6c7c4e3820a035e096dd1d78c6ccadd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:35:05 +0800
Tag:    v2.2.0-beta

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

commit 865b0b1437d001fffac8a43325c0d554193ef39f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 08:03:19 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle

commit c04b098343b49a81b2dc387ff2ddfe2b163580a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:42:05 +0800
Tag:    v2.2.0-beta

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

commit 47cd63bcd879cf2a3bd1b9b3bfa114ae4231ba3d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:36:25 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28481' of git://github.com/aolley/moodle

commit f342cd715a495494c912070ca37892d43c9e8b8d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:19:52 +0800
Tag:    v2.2.0-beta

Merge branch 'w33_MDL-28936_m22_msgstrlen' of git://github.com/skodak/moodle

commit 16302db3a4ef8a07b6ab978417c9c7c026d05f0b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 23 Aug 2011 07:16:34 +0800
Tag:    v2.2.0-beta

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

commit 29092038d865fe0336d4222a9b7e5c2f87acdd23
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 18 Aug 2011 08:38:24 +0800
Tag:    v2.2.0-beta

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

commit 1d1982c5a23978d6bad588c112877a6bb51936d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 21:28:55 +0800
Tag:    v2.2.0-beta

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

commit f5cf69047d421b200ceb6d874afc5dffb7ec7218
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 09:09:15 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL27951' of git://github.com/ankitagarwal/moodle

commit 2bdd5cf6ecc0a208b53da706ed54e0219f10bcfc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 09:04:34 +0800
Tag:    v2.2.0-beta

Merge branch 'wip_MDL-20804_wsdl' of git://github.com/timhunt/moodle

commit c2f4948cabeaa31d338632cb6dfba8875a14e625
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:58:40 +0800
Tag:    v2.2.0-beta

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

commit c4904bdab57df358dce8cb3128a798add31b6ed1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 08:51:09 +0800
Tag:    v2.2.0-beta

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

commit e1314fe3459e8a437d463f9034d28c6c9eec1bb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:28:41 +0800
Tag:    v2.2.0-beta

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

commit 682309687d82949c52f569bddfc603389a987d5a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 07:01:59 +0800
Tag:    v2.2.0-beta

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

commit 8b321291e2821543d03a6d1cec7217f1af4d2928
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:56:28 +0800
Tag:    v2.2.0-beta

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

commit a50fe03ebe72ff7f14129341a34df19dde72bb17
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:44:44 +0800
Tag:    v2.2.0-beta

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

commit b59545e6e59fa3fc062d3a75af42ef05459a33f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:32:23 +0800
Tag:    v2.2.0-beta

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

commit 11092aeb1645ab0aa8f7e67993277937b90e51d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:28:43 +0800
Tag:    v2.2.0-beta

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

commit ca00985a791e4216b3ee34bf7fddd0a6db719a85
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:17:14 +0800
Tag:    v2.2.0-beta

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

commit e2c65492c83c13352864582d514ed41a3d5569ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:08:59 +0800
Tag:    v2.2.0-beta

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

commit ff61183f43506654105097343075a50352d65049
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 06:07:19 +0800
Tag:    v2.2.0-beta

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

commit 6d4f4376404f70409c6001a86d5ac1b703de87b9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 17 Aug 2011 05:42:59 +0800
Tag:    v2.2.0-beta

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

commit 50c89706a760b5025c234da9a7346599e6872b05
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:07:54 +0800
Tag:    v2.2.0-beta

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

commit 78fe1bad479569b68a5a646fdddb3657e511e7df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 19:03:02 +0800
Tag:    v2.2.0-beta

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

commit 515380a9923e78d181c9146d9862409c5743ef80
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 17:51:24 +0800
Tag:    v2.2.0-beta

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

commit 2345ab864dda03273554cb4fcf60f68a860f5c9e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 09:03:26 +0800
Tag:    v2.2.0-beta

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

commit 6ae8a01edb229a9389c45b0e52202bb8209a27e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 09:02:29 +0800
Tag:    v2.2.0-beta

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

commit c4e560099c481c1a0515633b338d083f65fade68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:14:26 +0800
Tag:    v2.2.0-beta

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

commit f716839a3f5b93c188dcd3024d7da051f4c61d9f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 08:06:07 +0800
Tag:    v2.2.0-beta

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

commit f50675809fbe877cd84b54bd5eff2f6c12fc7e0d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 07:55:30 +0800
Tag:    v2.2.0-beta

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

commit 70fc3fb91967a64db77b165efc1e05b3a01ca3a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 07:52:59 +0800
Tag:    v2.2.0-beta

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

commit 485b56ee87cf452238f5d6338496b9716beceae8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 07:40:06 +0800
Tag:    v2.2.0-beta

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

commit 21507599b1d790a8d26624275968f3b458a7dd76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 07:26:34 +0800
Tag:    v2.2.0-beta

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

commit c380fbf4c9f76b29fcfbd766b72b5ad50053b978
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 06:37:23 +0800
Tag:    v2.2.0-beta

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

commit eed36bbbd9949a7b5399ce8a421a72412fea30ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 04:46:01 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle

commit 04a332d7402ce9aa5714a33371381a558e75133f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 02:00:53 +0800
Tag:    v2.2.0-beta

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

commit c97cc5c72fdc9a6a811d9195251ae0e5616f1129
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 16 Aug 2011 01:34:31 +0800
Tag:    v2.2.0-beta

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

commit 76f063fa5dfe76653713eec21cf945226b5de802
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 05:03:06 +0800
Tag:    v2.2.0-beta

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

commit 89c6def316b993cf5bc437cf03645487e291ec90
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Aug 2011 04:46:42 +0800
Tag:    v2.2.0-beta

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

commit 09e35896d472139f0e2782da9bb1343a5b57a8be
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 09:00:17 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle

commit 7e988ed160ba6eeb4d54c130d039782b08ae1559
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:47:57 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle

commit 628e2396af98ec0fc1720057b63e977198ab1f2b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:34:51 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle

commit 1ddecae7c78109386d7454b56c24922d5a256585
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 08:04:55 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle

commit 6d067fec6f8471905805b36b4169f4cae6ad002f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 07:58:03 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle

commit b16d8f59ab440e783ec0cb06f8b1ea09e4006ddb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 07:10:27 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle

commit 43c88235c54829c769990ea900b5452853da2318
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 10 Aug 2011 01:30:54 +0800
Tag:    v2.2.0-beta

Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle

commit 8a015bdb84b51f97103f8c40709d2ef7f34a2aec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 16:13:18 +0800
Tag:    v2.2.0-beta

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

commit 1c001177ea325a9d498eb6247ee7c92c33db55f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Aug 2011 15:41:53 +0800
Tag:    v2.2.0-beta

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

commit e62a947eec0b30222b10c8cc1b70c30bdf0b15c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:57:54 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle

commit dd8f2538b692c6167dca4be9e5de918889d0d4fc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 22:28:36 +0800
Tag:    v2.2.0-beta

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

commit 8654b65619224357f3d2718145701b69f24057c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 18:16:16 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle

commit d253e3cc9096f2e1c077645bbb1d67d612a321a3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 02:22:42 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle

commit 701570b5e4f2375ba0b71fed6407d386843d23d8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:47:14 +0800
Tag:    v2.2.0-beta

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

commit 8746aab856937a6597b163fa819f85f1f6a229ac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:41:00 +0800
Tag:    v2.2.0-beta

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

commit 7660f09ee6529ebd373cbf093830766a7c31e159
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2011 01:35:41 +0800
Tag:    v2.2.0-beta

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

commit fc75965b631b6637dcb577d241ec4db583a35337
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 23:01:58 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle

commit 2af4d0a27f3500ff3fa017124af3aa4ce93d9267
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 22:46:35 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-23580' of git://git.luns.net.uk/moodle

commit 3fe120a6c6e781e8252ba6a4659cafd28ab5e3e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 22:32:17 +0800
Tag:    v2.2.0-beta

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

commit cf5b3dad05aae984be9c89356e0fe1ce207d6828
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 22:25:42 +0800
Tag:    v2.2.0-beta

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

commit 97c5f85f374e151b6170c240c144c35c594173df
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:56:22 +0800
Tag:    v2.2.0-beta

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

commit 2abfc1c630e4a0264c3d33d3b6e95e1001cda3ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:42:21 +0800
Tag:    v2.2.0-beta

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

commit 21ba26e8144c19a732c56516cf9f6f5cd2fac424
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:33:03 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle

commit f046f96f05c43157851e99e70ac31565f27b88ad
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 21:20:56 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle

commit 75853bc5a54b3d49c2b5f66586989bf6105912bd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 18:06:22 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle

commit 23e90aa5b8c242e9f12a420da3f6f2021be23707
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Jul 2011 18:01:34 +0800
Tag:    v2.2.0-beta

Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle

commit 1f767468ac087ac67609d11026529322a0be697c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 07:11:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle

commit 4b02f9d2e9f67b8645e8ba4896d161bcad8c7b64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 08 Jul 2011 06:41:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28168-custommenu' of git://github.com/mudrd8mz/moodle

commit 26635fd7f967dd4358fac53708086be960b0c313
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 16:21:32 +0800
Tag:    v2.2.0-beta

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

commit d9aa768139ecdf6ae8df5071966605c48bf48136
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 16:11:17 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle

commit 907cc4ceb7369ffdf9708d6e366485f954c46031
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 09:00:42 +0800
Tag:    v2.2.0-beta

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

commit 627e4bd4a760ad3fcdce7cc6345f32b593b369c4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:36:28 +0800
Tag:    v2.2.0-beta

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

commit 5b77684af7bc18303c189f2f11c98e2ff13c4a22
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:19:15 +0800
Tag:    v2.2.0-beta

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

commit dfef3028ae05d9ff25420b3afa5f93e7070f2341
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 08:10:13 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle

commit 25e2bb1b83166f09817648377df8bcb1ba7b67d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 07:39:38 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle

commit 535a635afc3b0fb48ba8ca7ef22357ee9d4e90b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 07:32:30 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle

commit 482b1ea121b5746059b999c5e829efc8cca04600
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 06:24:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle

commit 4357214a49d5208bc3765af15b39cfb2c0787202
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 06:12:19 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle

commit b274bc55d0098aed0362b934c108177e70aadfd4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 06:01:08 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle

commit 83ca5bef347fb8b7fb67adbbce3dd9a76f74e443
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 02:27:52 +0800
Tag:    v2.2.0-beta

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

commit babbab1449217a91d454787d26ce385cb53f5968
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 01:25:47 +0800
Tag:    v2.2.0-beta

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

commit cb600c46060f05e5443cbe259107c4ed4d6e40ff
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 07 Jul 2011 01:03:59 +0800
Tag:    v2.2.0-beta

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

commit ea9ad8f1756f6743b7c4db0d54aa096b4025e82d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 09:13:11 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle

commit 7edcd093b65bdefd4d92f5494691ed0254e9c709
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 09:06:34 +0800
Tag:    v2.2.0-beta

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

commit 87cc19de07f8f6ffcffd9650f8bb991859693c7f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 08:54:12 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle

commit b2dfa10d5a7f9ae1977f1687d81918ca1bb727f7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 08:05:20 +0800
Tag:    v2.2.0-beta

Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle

commit 34d5507ab88dec5332dbfd54a9353b5420a9f335
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 07:52:32 +0800
Tag:    v2.2.0-beta

Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle

commit ed436add993fec4388132d7e319511d910b34b54
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 07:45:15 +0800
Tag:    v2.2.0-beta

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

commit 60ee61147d52ad3840e5e370b9e50369458f541d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 07:29:27 +0800
Tag:    v2.2.0-beta

Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle

commit 476ea4f8ce698aa1ad51af847df44531105a5111
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 01:55:31 +0800
Tag:    v2.2.0-beta

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

commit 6ce986e54ccd63509c09d1c9568cac50a3b0065b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 06 Jul 2011 01:41:32 +0800
Tag:    v2.2.0-beta

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

commit dd927fcefb076e50d8741e8319a85b2ee25a0a7a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:58:55 +0800
Tag:    v2.2.0-beta

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

commit 555ac0298512e30fd4231e6cc1c411a18663ddb0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 05 Jul 2011 23:46:46 +0800
Tag:    v2.2.0-beta

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