Git merges in Moodle x.x.x by Damyon Wiese

commit 5f5d4e9e69c85171790240de8849c6db0d4102ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Apr 2014 13:33:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle

commit 21fd2384dee574e983342c55ceeb59594925d98c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Apr 2014 15:44:39 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle

commit 43968c9f109ee77d5ccab67c21cf4c5d9f9146a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Apr 2014 13:05:46 +0800
Tag:    v2.7.0-beta

Merge branch 'mdl44669-master' of https://github.com/tlock/moodle

commit 0610d2ca92363189eb7fe2c99d9d1376c3b25d67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 14:18:50 +0800
Tag:    v2.7.0-beta

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

commit 48395a9cdbffbd51601c3b5907f799a9fc42fd0e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 14:01:34 +0800
Tag:    v2.7.0-beta

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

commit 515fe565f6723f8e3808b1d5fdb0308f9dd23ca1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 13:30:41 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

commit 594a5c8c02b602b2acfb73cd3a0246f87632bc19
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 12:32:49 +0800
Tag:    v2.7.0-beta

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

commit 19346e06cb1ce93d0395411ec7dba825691e9a14
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 12:16:42 +0800
Tag:    v2.7.0-beta

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

commit 1e16a5852551c0f76d1a813950cad027e6a2634f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 10:09:21 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle

commit 9f7e101fc76285dcf579b0b7d2feaf121e5daa04
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 09:27:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44342' of git://github.com/jleyva/moodle

commit e017c50bcfbd2c71a6a2344127309b527adca730
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 16:57:06 +0800
Tag:    v2.7.0-beta

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

commit 2aa476bbc80449904db03108ea41607c5a2293bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 15:19:11 +0800
Tag:    v2.7.0-beta

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

commit c61269af867646a7efda21a8b8fa0efb1e417d20
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 11:15:51 +0800
Tag:    v2.7.0-beta

Merge branch '44967-27' of git://github.com/samhemelryk/moodle

commit c8afcb2e7b529e8818d2248cca5c29869b65199f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 02 Apr 2014 16:33:06 +0800
Tag:    v2.7.0-beta

Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle

commit 81b4ec4fc3a484f1317ebcffb6f6b71037205e79
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 06 Mar 2014 11:41:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle

commit b9d8d54be26f4745a616e76933e411b37aa9b2f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 06 Mar 2014 09:22:13 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44403-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit d09cfab6604719b481afb6a6285fabd6894bfa4f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 06 Mar 2014 09:21:24 +0800
Tag:    v2.7.0-beta

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

commit 6b1e9b0cd41be8b7dd947112978baab2256140bb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 14:51:18 +0800
Tag:    v2.6.2

Merge branch 'MDL-43635-m26' of https://github.com/brentboghosian/moodle2 into MOODLE_26_STABLE

commit 186b8fed305a9e75888af4674ee4f96f0a55b624
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 14:04:00 +0800
Tag:    v2.5.5

Merge branch 'MDL-44370-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit abfc156859280149d46c4f93a337b3158b31d8b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 14:00:57 +0800
Tag:    v2.6.2

Merge branch 'MDL-44370-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit 0cc30f6fcf8a9d3d2ef22e9e6f2d11e3004808a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 13:44:56 +0800
Tag:    v2.7.0-beta

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

commit b33ec0697b5269e620251cfaab075f47212b9a82
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 13:35:14 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-44312_cron_overdue_warning_Does_Not_Take_Care_Of_cronclionly_And_cronremotepassword' of https://github.com/scara/moodle

commit 3294c1e6dd3122a0ad4e43db57b1599fbb499b3e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 13:17:18 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41585' of https://github.com/totara/openbadges

commit 23d142ef5a9bbae9705637b67aa32dcb7308f544
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 11:36:16 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle

commit 4cb6f806d7a5437c14a14b32b818bfc5579f98e5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 10:13:56 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44074-master_4' of git://github.com/gjb2048/moodle

commit c6465439d0e7223be45ef304e7892e5ecbccf2bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 09:58:54 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44074-M26_4' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE

commit bdf5c9bd164acd2dd8d1dfc12578f69e76c51f53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 05 Mar 2014 09:43:30 +0800
Tag:    v2.5.5

Merge branch 'wip-MDL-44074-M25_4' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit fa52adce76792489251bf557cdad401006618928
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 16:59:10 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle

commit 98b51f38828fccaa3d0a4f215e0e186f5ca2e1e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 14:27:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle

commit 90f9c88da2450205c09350d2b7ff6ce344fad224
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:41:55 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42842' of https://github.com/danielneis/moodle

commit ca0361084b03151cedf1567944e5a0be72faf207
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:32:43 +0800
Tag:    v2.7.0-beta

Merge branch 'w10_MDL-41266_m27_logging' of https://github.com/skodak/moodle

commit 267c4b4292f5632f4489626f46a086b4fee02716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:29:03 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle

commit 0fc189a4b46b7b4abc5cb3e264753bc452221c6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:28:18 +0800
Tag:    v2.6.2

Merge branch 'MDL-43738_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 94a875bee9e380bed0ad5044512b2bd5893a1da3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 04 Mar 2014 13:17:46 +0800
Tag:    v2.5.5

Merge branch 'MDL-43738_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit a97718eaede07b828fcc11a69203d41a774de4d5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 28 Feb 2014 10:02:41 +0800
Tag:    v2.6.2

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit e6232f35d8c38e41f4136e6e1176205b138417a1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 28 Feb 2014 10:02:19 +0800
Tag:    v2.5.5

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit c79ee48b6748164e7fe37a34341bdd4dbc5e8910
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 28 Feb 2014 10:02:04 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 28b3ddbdbeef64246611a9b935ad765c3e292838
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 27 Feb 2014 13:32:22 +0800
Tag:    v2.5.5

Merge branch 'wip-mdl-44248' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 00319097c5a99652dc55cb05939008acea8da8ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 27 Feb 2014 13:18:27 +0800
Tag:    v2.7.0-beta

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

commit b174b543d8f3c2115fe006859cc913d301ce2727
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 16:44:48 +0800
Tag:    v2.6.2

Merge branch 'MDL-43723-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE

commit 58ff6e51df1c3f74ca282e68f256db1134a2a40d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 16:43:56 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle

commit 5c7a266e658215fa80ce456e0bdbe076c0c5b7b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 14:14:31 +0800
Tag:    v2.7.0-beta

Merge branch '44255-27' of git://github.com/samhemelryk/moodle

commit 03b8d9e3c3422dd540f11517d259aff2e7a37a2c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 12:44:35 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle

commit 494afb8180becbb0d2966822d8679d18b2211bc9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 11:09:53 +0800
Tag:    v2.7.0-beta

Merge branch '44315-27' of git://github.com/samhemelryk/moodle

commit 94133c20fa05c6241a3ceef01b76a7245b47ffd5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 11:05:26 +0800
Tag:    v2.5.5

Merge branch 'wip-MDL-40619-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 0e0bbd9922d684c79cff5c3da7fa28656f066cbc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 11:04:40 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-40619-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit fce9daa806eade0192a13959bb0f0215fa6b7573
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 10:53:09 +0800
Tag:    v2.7.0-beta

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

commit 63e604f8b198c1a19c703b93b0485e40a597be96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 10:32:44 +0800
Tag:    v2.7.0-beta

Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle

commit b33fbd428ed35dd29a4841d09d8721c7dfc66591
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 10:26:22 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42923' of git://github.com/jleyva/moodle

commit ed24890b68e4ec0ea76b8e64e712e7447c8dd0d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 25 Feb 2014 09:21:30 +0800
Tag:    v2.7.0-beta

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

commit 7c9f70acd46f8ad45c79cb57e045e6ce9a33589d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 16:56:21 +0800
Tag:    v2.6.2

Merge branch 'MDL-43837_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 237243db0242aa5ad2913521c6dba65bcb55ddaf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 16:56:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle

commit dea614e49358b1fd145141e6ff2a7deb44c9d274
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:42:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle

commit 5f98c897b4888a870174310d14f3b64cf01e371d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:40:28 +0800
Tag:    v2.6.2

Merge branch 'MDL-44111_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 8c3966773be69cc7121663f8a87c8857d4287dd7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:39:32 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle

commit ccc296670922af2b28ddcd60f59b0b07695a358b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:28:51 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle

commit 6258e288aeeaddbeb726b6a4a7a87bdcd8b490c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:26:05 +0800
Tag:    v2.7.0-beta

Merge branch '44159-27' of git://github.com/samhemelryk/moodle

commit 9334d950094766ef2aa057beaf5b0862b435a5b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:22:42 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-44168_26' of git://github.com/ds125v/moodle into MOODLE_26_STABLE

commit 28a03399b32ea7b937f10f3c7bc69c7c68303528
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:20:49 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle

commit 956c7f2c397830e7552016bf647438ca0cfab6a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:15:00 +0800
Tag:    v2.7.0-beta

Merge branch '41175-27' of git://github.com/samhemelryk/moodle

commit 5bc18d295a0b1d7cd35fd2c5408cf19aba38fc7c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:13:00 +0800
Tag:    v2.7.0-beta

Merge branch '41176-27' of git://github.com/samhemelryk/moodle

commit 801e26ed64d42ef5327fd9d798a4620032c5c809
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:10:53 +0800
Tag:    v2.7.0-beta

Merge branch '41177-27' of git://github.com/samhemelryk/moodle

commit 9383bef6587aa36bee682789f28f5893e2875bcc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 15:08:33 +0800
Tag:    v2.7.0-beta

Merge branch '41178-27' of git://github.com/samhemelryk/moodle

commit 18bc3faef9ae5afa3d876eee13d21bfdbb16ae8f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:51:08 +0800
Tag:    v2.7.0-beta

Merge branch '41179-27' of git://github.com/samhemelryk/moodle

commit 5c47971b4a3f77203ff83b8a535d8005ad4deab3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:49:10 +0800
Tag:    v2.7.0-beta

Merge branch '44182-27' of git://github.com/samhemelryk/moodle

commit b68658325b65e66f9a6eb994473b664ae8c11d09
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:46:16 +0800
Tag:    v2.7.0-beta

Merge branch '44183-27' of git://github.com/samhemelryk/moodle

commit f08c69aba277951765a10e21b5bda2136fc23835
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:41:29 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle

commit 2926b2549271d9eecd8fe6ef87b41ae23eb2de8b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:32:49 +0800
Tag:    v2.7.0-beta

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

commit ede0d157653a499f2b723191cb22d855abb8fa4a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:30:08 +0800
Tag:    v2.6.2

Merge branch 'MDL-44247-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit d3ccdf54bdf4ea503b29d9daa014f791878845a1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 14:26:29 +0800
Tag:    v2.5.5

Merge branch 'MDL-44248_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 9a85b4e05345750eafe984cdfb8a614a075cd859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:40:47 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle

commit 5e200e3215ae5a541c8afbd40771fa1db9c2e9bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:39:05 +0800
Tag:    v2.5.5

Merge branch '44279-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit ff7b9d9d8f677ed5ef33773923712e70a5d1d1ac
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:38:33 +0800
Tag:    v2.6.2

Merge branch '44279-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit e848a930d21ece37c516133c2ef05c6041d0eab9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:37:52 +0800
Tag:    v2.7.0-beta

Merge branch '44279-27' of git://github.com/samhemelryk/moodle

commit d92edc97b56c3e9a4fd7954201d3780842b6c041
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:34:08 +0800
Tag:    v2.5.5

Merge branch 'MDL-44286_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 1998e85cf1852a71872035ca4dda6db7460bf3b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:33:42 +0800
Tag:    v2.6.2

Merge branch 'MDL-44286_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit e3eaf61db159cd759d07d4e21d459116687b692f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:29:58 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle

commit e2f19c6b33ab77a6a298afd64463f495f84317ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:27:45 +0800
Tag:    v2.6.2

Merge branch 'MDL-44288_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 13c12da2e567d158b8092ba56691801aabd2a36a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:27:12 +0800
Tag:    v2.7.0-beta

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

commit 164ad1a30afeff8481e13c2708026cc6411813da
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 13:10:22 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-18633' of https://github.com/danielneis/moodle

commit 1ed6bd87a2daa023fa1f21b96eefca70b976be71
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 12:30:55 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle

commit 25de7d88e76ce74b95625baa5ce771600ac0299f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:42:51 +0800
Tag:    v2.7.0-beta

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

commit 89093f0f07aeb090ac7a50c4dc32649122520a13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:14:25 +0800
Tag:    v2.5.5

Merge branch '44217-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit ebe9c36cb52f21e82adbc7abbdf7097f11441295
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:14:05 +0800
Tag:    v2.6.2

Merge branch '44217-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit aeacaa141e5bc81830add2e3bf5f2b214953d878
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:13:38 +0800
Tag:    v2.7.0-beta

Merge branch '44217-27' of git://github.com/samhemelryk/moodle

commit 931c3f4cfb154ec8433c065ce53ef9380d058e47
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:10:37 +0800
Tag:    v2.5.5

Merge branch 'MDL-34319_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 24d6ab75fccc7442552dd428164fd2f95adb4068
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:09:57 +0800
Tag:    v2.6.2

Merge branch 'MDL-34319_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 0721fb9113724d0a790c18cd6bdb1f1ee3c8fdf5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 11:08:03 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-34319_master' of https://github.com/markn86/moodle

commit d36afa9f1773a300edf21ae7b348704590e4f3d2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 10:41:49 +0800
Tag:    v2.5.5

Merge branch 'MDL-41767-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 41a10883b604d6ade3f8296a390044042823fadf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 10:41:25 +0800
Tag:    v2.6.2

Merge branch 'MDL-41767-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 89ede7e12dd2d34ba0fad4f0781f980fff9e0b8c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 24 Feb 2014 09:57:15 +0800
Tag:    v2.7.0-beta

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

commit e50a4e2386b36a6926eeedc2823449592e31e019
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 19 Feb 2014 10:25:00 +0800
Tag:    v2.4.9

Merge branch 'MDL-44018_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 4131d08b7484ca38ce852b6af0076a915da99175
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 19 Feb 2014 09:20:36 +0800
Tag:    v2.5.5

Merge branch 'MDL-44118_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 5e9d6beaa303b1148ac12d3eb5a62c3ab62cde9e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 19 Feb 2014 09:20:07 +0800
Tag:    v2.6.2

Merge branch 'MDL-44118_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 6071a209fe0a09d40489886381ebc843babbb779
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 19 Feb 2014 09:08:42 +0800
Tag:    v2.7.0-beta

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

commit f68e555684ef91c0d52ce4759a101bb69bce21a5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 15:37:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39337' of git://github.com/apsdehal/moodle

commit 28ac492db33e9549992bde9d888690ff88f2cef3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 14:05:32 +0800
Tag:    v2.6.2

Merge branch 'MDL-43802_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 60c85b8596c24932526cf8ab6f3af14e2dcbe2b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 14:01:33 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle

commit b41ea78c3956840c126265e156893e5166f002b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 13:56:11 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-44187-master' of git://github.com/andrewnicols/moodle

commit 5c219bbc84aaa5134906e07a4ad3598f0d2f1400
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 13:46:11 +0800
Tag:    v2.7.0-beta

Merge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle

commit ead7a51e420d3ef9ba8378b602f170c0224902a1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 12:42:31 +0800
Tag:    v2.5.5

Merge branch 'MDL-41646_25' of git://github.com/apsdehal/moodle into MOODLE_25_STABLE

commit fa0016a8a2627614f2a57ab3b12aeccace8d9e4e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 12:41:42 +0800
Tag:    v2.6.2

Merge branch 'MDL-41646_26' of git://github.com/apsdehal/moodle into MOODLE_26_STABLE

commit 62f641efd3d8fc074da96b780b7dd87807477197
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 12:40:56 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle

commit 0e84ecefcc098e1d1082da0468496a9ed03aab35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 12:00:45 +0800
Tag:    v2.7.0-beta

Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle

commit d306807e0280318520de945d180067ca73f422bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 18 Feb 2014 10:16:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle

commit a0cb27f72a5d5bb91c94c41548b36a935ec3f825
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 16:08:50 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle

commit 9e72fa97a9bd71e9caa684db35d46cef5d695d21
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 15:32:45 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle

commit 1265a7c4c5c1a29ecedad8601f8e3fd45f6e0b49
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 15:04:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41758-master' of git://github.com/jamiepratt/moodle

commit 1d355900292dea398638038561f10bcb72dcf22a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 15:01:45 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41755-master-v2' of git://github.com/jamiepratt/moodle

commit 4339015aca77bbf30928c9a98b2a117f364c5a37
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:37:18 +0800
Tag:    v2.7.0-beta

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

commit 590a9dc30a91fba5b3959171f2667589352e52eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:35:36 +0800
Tag:    v2.6.2

Merge branch 'MDL-43169_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit 2c3e6e3d16eae917045c615444cecdec3c725ea9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:24:52 +0800
Tag:    v2.5.5

Merge branch 'MDL-43504-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 31ab685057339cb2d84500c03ecd2c82b51a928f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:23:40 +0800
Tag:    v2.6.2

Merge branch 'MDL-43504-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 12aca2577a370fc28cf39e78aa8ae6001c993043
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:19:36 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43504-master' of git://github.com/andrewnicols/moodle

commit 8053854592571abace08ce7b493ca264a61e0e1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 14:12:16 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle

commit 09c7f57fd2e57eb7b99388d71360257860f90adf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 13:14:45 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle

commit dd8cfb18cbb9318d0441f79f353061e541fcdedb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 11:40:50 +0800
Tag:    v2.5.5

Merge branch 'MDL-42902-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 6b7f27698ce264964e4b1c4ad0d68e1fd19a4492
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 09:25:21 +0800
Tag:    v2.5.5

Merge branch 'MDL-44018_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 759e616eb6e48483098631ccbe34ab592590e041
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 09:21:46 +0800
Tag:    v2.6.2

Merge branch 'MDL-44018_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit a47e7a1abb2c99f3c5ea784d7d3d63a375aac4c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 17 Feb 2014 09:14:46 +0800
Tag:    v2.7.0-beta

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

commit 6baeabc140a56abfae90db3f0f7559f4f772f3af
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 23 Jan 2014 10:27:18 +0800
Tag:    v2.7.0-beta

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

commit ce3b8b0e71e31ddaf3c354e7036b76286a7522ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 22 Jan 2014 09:52:38 +0800
Tag:    v2.7.0-beta

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

commit 5c66818d779b93ad460a8d9305691c25c1b8302c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 16:40:43 +0800
Tag:    v2.5.5

Merge branch 'MDL-42104_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit eef0d3043cac4031fc0d9e08f0ab9e43d916bc2e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:55:49 +0800
Tag:    v2.6.2

Merge branch 'MDL-43725-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE

commit 9102d4ef4e879804addc5cfa2ebe4a1706cf3f0b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:48:48 +0800
Tag:    v2.5.5

Merge branch 'MDL-43725-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit e677c1be7cb32a30151a4d5e416b03e92b5d5d83
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:47:39 +0800
Tag:    v2.7.0-beta

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

commit 29f7aef8e9e3abcea5673ff50393dc91c79f34ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:17:05 +0800
Tag:    v2.7.0-beta

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

commit f329801959cd31d8834f7d2f107e07e79ecb9827
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 13:06:30 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges

commit c821f113ccaac68a3e40ad0f3a0e457d58767136
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 12:57:05 +0800
Tag:    v2.7.0-beta

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

commit 5388c6665ffda86e8df8ba7bf198fcfcb2b26023
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 10:41:40 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle

commit 021aa8c16c629a4db99cfe158fb657e89995421d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:43:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-41688-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 9717c4b19c9b49a2d901e21fabcd1bb501dbf777
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:37:04 +0800
Tag:    v2.6.2

Merge branch 'MDL-41688-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit d3b5017940af45c77c3b290a9ff12cd0441ceba9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:35:21 +0800
Tag:    v2.7.0-beta

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

commit d6d18a2b7b2d6cab26312f718184d18649cd36a9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:29:40 +0800
Tag:    v2.6.2

Merge branch 'MDL-43732_m26' of github.com:merrill-oakland/moodle into MOODLE_26_STABLE

commit 7b6464bf9d5ff3001de94dfb3186e40bf86ab3c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 21 Jan 2014 09:28:54 +0800
Tag:    v2.7.0-beta

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

commit 4177d6a097dc67d56c65a6a6e01ac37fa2facc9d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 17:10:38 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle

commit ae69bab27fcc6dde025e2038be5ed9689d659919
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 16:20:15 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle

commit 3a96e8b4c3c058c62c3f32af273a0863042e1b1a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 16:02:54 +0800
Tag:    v2.7.0-beta

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

commit ac97a7ed53c9f51d707b4995a559664c689e1037
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 13:21:58 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle

commit e35e70f83d0c13510e63b2b00de5c894ed396008
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 13:21:34 +0800
Tag:    v2.6.2

Merge branch 'MDL-42495-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE

commit b53af0f2a6300bc5ccfee7be2eb0a22f934e95c7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 11:29:21 +0800
Tag:    v2.6.2

Merge branch 'MDL-39683-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 6d7d401711b549a391d418cb55c46b27b3e60add
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 11:27:07 +0800
Tag:    v2.7.0-beta

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

commit f93f62ae7b75f5872806f859ceb1c78d451e27a7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 11:05:21 +0800
Tag:    v2.5.5

Merge branch 'MDL-39683-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 1687d46223983fc14134e98a3479b1562acb5727
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:58:14 +0800
Tag:    v2.5.5

Merge branch '43675-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit c8bfabd267f56ebf288798bdab394dfae28d0945
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:57:30 +0800
Tag:    v2.7.0-beta

Merge branch '43675-27' of git://github.com/samhemelryk/moodle

commit 5b860c69a2e6df4a7d10721b2bce577355a89f78
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:56:34 +0800
Tag:    v2.6.2

Merge branch '43675-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 12c0236385073343f2ba6731f5c6d4b1d2927312
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:41:36 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle

commit 0be26df8b191def013d6f16460cf388cc15b9922
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:15:24 +0800
Tag:    v2.5.5

Merge branch 'MDL-43733_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit df25d333798cc8f9ccbbc7cbb24e79195ea7fa3a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:13:54 +0800
Tag:    v2.6.2

Merge branch 'MDL-43733_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit b72aa1adcbbbd4dd371067a09633bafba6e90960
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Jan 2014 10:02:40 +0800
Tag:    v2.7.0-beta

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

commit 8e3be93572730c26fcd8bdef15bc0c7831186a30
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 16 Jan 2014 16:35:22 +0800
Tag:    v2.7.0-beta

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

commit 5af6a32866fc7fa5f03c4698dcd7ba547d0192ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 13:30:58 +0800
Tag:    v2.6.2

Merge branch 'MDL-43621_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit e1dd20b34ea95a4587d44477e4081e6c4ee0c0d2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 13:27:30 +0800
Tag:    v2.5.5

Merge branch 'MDL-43621_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit efbed79063a28c39b9cb4bef31d0c5581f0e3702
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 13:17:31 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges

commit 7508094a87eec9578d82fd57590e8aac1321ec25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 09:39:03 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle

commit f5d810b4f33bd3a02a2bb2a6d9ec20a591d5486b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 09:38:46 +0800
Tag:    v2.6.2

Merge branch 'MDL-43461_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 788e545b4d6498c71e9b4c15d1cac5fc7ffd8e76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Jan 2014 09:38:02 +0800
Tag:    v2.5.5

Merge branch 'MDL-43461_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 718f42ae68ef8c3f6da37f1618c6b016f36a61ca
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 16:21:21 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle

commit a1ac22b8152ee28391c97ff65399625007b13ce1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 15:18:37 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle

commit 761549816da6c5b75c93523bd5d415571ab915ca
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:29:58 +0800
Tag:    v2.7.0-beta

Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle

commit 7b0e78bf836eedfea7997529d29cebd6756964dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:29:34 +0800
Tag:    v2.6.2

Merge branch 'w02_MDL-43511_m26_bankcache' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit f27e462b5f4952c2dbf83e2ed8ea0b6c60c270e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:23:06 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle

commit 24607ba326e8ff8a077d0f42f47b7fecab3f6dee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:05:27 +0800
Tag:    v2.6.2

Merge branch 'MDL-43371-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit a27a965a52e3f89a216859ffb01dc6c9997e49b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 14:03:32 +0800
Tag:    v2.5.5

Merge branch 'MDL-43371-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit c98ee8cdc00d934644eec75fcde1f89852f7c210
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:59:26 +0800
Tag:    v2.7.0-beta

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

commit 952f0a162001d91f51b5cb4191b4240a6229f454
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:34:33 +0800
Tag:    v2.5.5

Merge branch 'MDL-43460-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit eb8f1fef79a1d1ed614f9a11400407ab775014c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:33:30 +0800
Tag:    v2.6.2

Merge branch 'MDL-43460-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit b6dc2b72b2e2db24b9947af0dc8aca419f2c9f52
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:25:44 +0800
Tag:    v2.7.0-beta

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

commit 5a0cf2cda045ca7e06d184503e9aba5845a501d2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:18:35 +0800
Tag:    v2.6.2

Merge branch 'w02_MDL-43488_m26_signreq' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 9289d5fe72a80f4235caeb8052b4d54b9d61be8e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:18:16 +0800
Tag:    v2.7.0-beta

Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle

commit 961f70adcdcbce0a8b17a017ea037004d0fe0d5f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:14:09 +0800
Tag:    v2.7.0-beta

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

commit f8a60dfe88b01d1c675a0d4858ad89928c859a70
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 13:06:54 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle

commit 020705cca08e81a6eb7baf9ebc0fde35de26d25d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 12:37:17 +0800
Tag:    v2.6.2

Merge branch 'MDL-43610-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE

commit 88bad1ec38483826260fcb68b5e89041a2c8cfff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 12:02:50 +0800
Tag:    v2.5.5

Merge branch 'MDL-43610-m25' of git://github.com/micaherne/moodle into MOODLE_25_STABLE

commit 49ca1e77b0ce395d83d4e6118f5bbb02abffbf54
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Jan 2014 11:57:09 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle

commit 8aaad0d2b6bce7bc42dd9d1b25d16a56a723823e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:20:52 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit 4fc875458868cfa6cbd009e68fa47198e10c1dc8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:20:14 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit f8d0e9ad5b819652d7bd777aa375c225a507062d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:19:55 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit fb4c6f454b97afece13b2024d4faa28da7e1c139
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Jan 2014 14:19:31 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 8af52d3188e6de9520eab6b28116e93db2805027
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 16:57:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle

commit 715d0505c4ca444b90adfe2238ff3443d2efb058
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 16:16:48 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle

commit fcd640a51a78741ef559061201c03c56877e9ba7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 16:15:16 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43271-master' of git://github.com/andrewnicols/moodle

commit a66aea5c67be90403f42cf031431b447f49e8f32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 16:10:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-36334-master' of https://github.com/andrewnicols/moodle

commit abc217b2bf55eb181fe7289f1596fccf8fd13947
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 14:10:40 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle

commit 708e0804b8affa9ccdb00db5b2ca36475cc89daf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 13:33:53 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-43585_m26_userlib' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 454fab1ac75b00bd248972a7e27aa0741073cccb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 13:30:24 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43585_m27_userlib' of https://github.com/skodak/moodle

commit 778c03ccb1fea2e5026ab4b950789c848ddb0290
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:53:07 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle

commit 3a8e16ecabe64d5294e390b24c3bf53ed3f5addd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:52:49 +0800
Tag:    v2.6.1

Merge branch 'MDL-43411-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit dd7f25835e32082cc05d3862ac3100899f703dcd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:52:26 +0800
Tag:    v2.5.4

Merge branch 'MDL-43411-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit e011f229a84a6d84ec353e3895be8400be71624e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:29:45 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle

commit 3a145daba4df84fcd6e9a9c3ba3e1f6490ab53be
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:26:01 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle

commit de47c9c81b72e79cb190507efe0e0c8c874dc042
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 12:22:49 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle

commit daaa692b0509c37b46eb9960dd11e04fafd6d9ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:22:27 +0800
Tag:    v2.7.0-beta

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

commit 28abbabae537d441230b184aac4e6c5cf34b71c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:22:15 +0800
Tag:    v2.6.1

Merge branch 'MDL-43448_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE

commit 5ca04a7039bf43ade63779484ea6aee16bb77e3f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:21:54 +0800
Tag:    v2.5.4

Merge branch 'MDL-43448_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit f8acb4a7de836c8c73404bd154f93659cd8bdf9e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Jan 2014 09:15:08 +0800
Tag:    v2.4.8

Merge branch 'MDL-43448_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit f81aec80ad98f0c72aac7991cb46a3761e319abf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:14:41 +0800
Tag:    v2.5.4

Merge branch 'MDL-43399-25' of git://github.com/mouneyrac/moodle into MOODLE_25_STABLE

commit 9ce83d090862fe2d116a6f4eb9aed63be63b5504
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:14:02 +0800
Tag:    v2.6.1

Merge branch 'MDL-43399-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE

commit 21197e9d4a4b6d9aeff6d2a59f84ac0de40050db
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 16:13:44 +0800
Tag:    v2.7.0-beta

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

commit 0f399f7f74e3fab5ed82e9fd8f52e3ffb8da7aa9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 15:52:17 +0800
Tag:    v2.6.1

Merge branch 'MDL-43454-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 717093583fcf7e6940f0aa53947f88e855988ee7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 15:51:25 +0800
Tag:    v2.7.0-beta

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

commit 5490662aded1e04cbca3c22d56d05b70fcaf50da
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 15:48:31 +0800
Tag:    v2.7.0-beta

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

commit 9f83e42fe36660c8108b69ba0fd44118817b1f53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:52:56 +0800
Tag:    v2.7.0-beta

Merge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/moodle

commit 5726fe62639b591b6dcd6fa7d820d3f185720739
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:51:16 +0800
Tag:    v2.6.1

Merge branch 'w01_MDL-36721_m26_passlog' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit 331ecb86f96425b0fe7f4fbe16959b5c6ed25e35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:50:39 +0800
Tag:    v2.5.4

Merge branch 'w01_MDL-36721_m25_passlog' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 506bae6791eb945b0f1db4615650c3b04fbb21e1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Jan 2014 14:49:39 +0800
Tag:    v2.4.8

Merge branch 'w01_MDL-36721_m24_passlog' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 996c1d5b1577218c7085ef69a75b93fb4f67109e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:58:07 +0800
Tag:    v2.6.1

Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE

commit fe17c7e8e65b582330a0950e71891ad08be07ae0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:57:38 +0800
Tag:    v2.5.4

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 271871846488c4fa0e0a4c4e85aa295171e6e359
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:57:12 +0800
Tag:    v2.4.8

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 4cdae94e0835e581d6590e59f6ce12970a44e01c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 20 Dec 2013 11:56:54 +0800
Tag:    v2.7.0-beta

Merge branch 'install_master' of git://git.moodle.org/moodle-install

commit 88e39201d7af38c54c45c3da4843b2ad07b7bb1a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Dec 2013 09:52:51 +0800
Tag:    v2.7.0-beta

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

commit 247901a4f77ac827dab97e07507ef59f4eff3baa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:30:15 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-42731-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit cb891e57f0fcf557ae4f7a6d761b3380608f5352
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:29:57 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-42731-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a977fa7b36f449161ac5bd6584e5e286f0e5bfee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 17:29:39 +0800
Tag:    v2.7.0-beta

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

commit 4e14b95f0ee3178ae6af3de94a10556291ce7c22
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:29:39 +0800
Tag:    v2.6.1

Merge branch 'MDL-42627_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 23a05a1b9a88820db4e1f581af0a0d348a0a7390
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:15:53 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle

commit a87ae3371d45160087ba093f0eba2e0ea1570d60
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:12:27 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-43026-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 4d32c0c6d0f4f7a71c8541bfec3a3871d839e632
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:12:08 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43026-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit a5ec4f7ae9c8dc420d642f62e57cda871705b065
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 16:11:48 +0800
Tag:    v2.7.0-beta

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

commit 53741d32a6f8cb7104b84a1b8c1fdf1247f61da5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 15:15:25 +0800
Tag:    v2.7.0-beta

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

commit 8f49492ac279d3ccefd4304a9afedecae9ec5f3e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 14:17:34 +0800
Tag:    v2.7.0-beta

Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle

commit 6b8c6278bc8155f883e0b62db95d1e42d36f59d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 13:18:47 +0800
Tag:    v2.7.0-beta

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

commit e7af63633efd467423851954d443eff85ffb260a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 13:03:32 +0800
Tag:    v2.7.0-beta

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

commit 7183b0f995048f49f0657de3807b4aa7d967476a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:44:28 +0800
Tag:    v2.4.8

Merge branch 'wip-mdl-43048-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 73e2de1ff902529fc67b10c7e05f10858f32eff5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:44:09 +0800
Tag:    v2.5.4

Merge branch 'wip-mdl-43048-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit e2a2209ed6ddb7cd3e41efef3928318871aecc1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:43:53 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-43048-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit b3d252a6b46b7037578b4082a7a2f6f4466543fd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:43:32 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle

commit 1cf504414d7682533893bfeb4c709940389b7999
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:25:36 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-42904-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit cf569389abd7163eea305a5a37f6618a218122c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:20:47 +0800
Tag:    v2.4.8

Merge branch 'wip-mdl-42904-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 05d6010d2c3ef4523cf646d5f9a7d80e9942e92f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:16:53 +0800
Tag:    v2.5.4

Merge branch 'wip-mdl-42904-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit de3e0d20bd0205442d5869861b8401c241fbafd7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 11:10:18 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle

commit 13410584be25c6e8edc23f71ffbeb5dbbd00769e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Dec 2013 09:26:58 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle

commit 2a1e730eb3bb4271449819284f83d39b738c661a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 15:16:12 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle

commit 7363aacb651795e132e401d4cff3472ac0d131d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 15:01:37 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle

commit cc9651dcae4fc15b75146303b7c7b4a4be1682ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:37:22 +0800
Tag:    v2.7.0-beta

Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle

commit 88c5d93aa1fdd4b3b6003781268858e9bab3adb0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:37:03 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle into MOODLE_26_STABLE

commit ccd4e10e00762ca6a6eb969b5fd32cae01ed16ec
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:36:33 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 4818244d27182dd9bb48dd0c42c7a7d0315a16b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 14:35:53 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit df68e73824ca5ff562765f452addb9370a1e6ea1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 12:16:59 +0800
Tag:    v2.7.0-beta

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

commit 8d68ea7233431a8ae51a0895dedbef16c84e4901
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 11:23:46 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle

commit 39177fd3a7f41fa0178036d60eded23fdd98fa58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 11:23:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-43018-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 2f6a01e094d36803a5961f7e496fc57e8a11716f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 09:51:08 +0800
Tag:    v2.6.1

Merge branch '43033-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit ecfbb657f3e782c79cb9a4e955ad612a7607155e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Dec 2013 09:33:39 +0800
Tag:    v2.7.0-beta

Merge branch '43033-27' of git://github.com/samhemelryk/moodle

commit 1e9c117f503c9c6948468b4992bd6443b9817bcc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 16:59:04 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-43008-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit e359857e410705dc88d6e3176296a27295ab2565
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 16:56:20 +0800
Tag:    v2.7.0-beta

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

commit 46b9d1bec61a0a57f33a8525ae7e65054a663ec6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 10:49:32 +0800
Tag:    v2.7.0-beta

Merge branch 'master-mdl42998' of https://github.com/tlock/moodle

commit 5f9aa41321188c420ab49cc9d3c471e1f8db0feb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 09:33:36 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-40850-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 18962add088e2bd904d8dbf81ccfc5552e66e2e4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Nov 2013 09:29:44 +0800
Tag:    v2.7.0-beta

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

commit a184b3d71234a7db453990df1daf9307b33e3098
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:52:26 +0800
Tag:    v2.7.0-beta

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

commit fdeb639eb8e5ed8438df86493582a6e11c6727ea
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:04:05 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through-text-filters' of git://github.com/michael-milette/moodle

commit bf44c1e521d8f380d44e3647e11cd622a9d56b3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:03:26 +0800
Tag:    v2.5.4

Merge branch 'wip-MDL-41257-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit a1554ea241b9bebce4194c2656b1fba268f195e4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 14:02:30 +0800
Tag:    v2.6.1

Merge branch 'wip-MDL-41257-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 689c45e54e1c3859b41f12cd6f28a90080e656c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:47:10 +0800
Tag:    v2.4.8

Merge branch 'wip-MDL-41257-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 45d9d6d710d7440903ee8b6ba7b1cd855e3962db
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:17:13 +0800
Tag:    v2.4.8

Merge branch 'wip-mdl-42924-m24' of https://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit d1dd8b1496757826a1af6238c2d04cba03075b57
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:51 +0800
Tag:    v2.5.4

Merge branch 'wip-mdl-42924-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 025bd122a61ac56350f3fe6bb1345e40c0f3d0a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:37 +0800
Tag:    v2.6.1

Merge branch 'wip-mdl-42924-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

commit aacd01f28e2b1a8df90ae21dbdd9e3649fb3f34c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:16:04 +0800
Tag:    v2.7.0-beta

Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle

commit dc4c0310ee94324210602a53a3f8e3cccc83cfbe
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 13:11:24 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle

commit 818c05cd0e964fae26fb193100661fac50e6b42f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 12:30:46 +0800
Tag:    v2.5.4

Merge branch 'MDL-42913a-25' of https://github.com/srynot4sale/moodle into MOODLE_25_STABLE

commit c3208c17d1d382ea934eed542bdbe48864a7a99a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Nov 2013 12:30:23 +0800
Tag:    v2.6.1

Merge branch 'MDL-42913a-26' of https://github.com/srynot4sale/moodle into MOODLE_26_STABLE

commit 199e6445f829e7327236631b298a2ccab2fa2690
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:51:53 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 5a2d5cfaf1ad62d58fced93e882c54740d29dfc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:51:36 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 49d367d47e3e491bc84e21676bfd0626e3971b18
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:50:49 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 86249e9aeb1fe15669599522a6224d24994c9022
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Nov 2013 09:49:57 +0800
Tag:    v2.7.0-beta

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

commit ef16df1449f82642f6423f56a778b75a2da5cab4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 16:08:57 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle

commit 52454bedeea415045d9c7c438ee2f414d4769392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 16:08:31 +0800
Tag:    v2.6.1

Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle into MOODLE_26_STABLE

commit e9182f584fc7e85ee837517684e6b228504efe9c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:27:53 +0800
Tag:    v2.5.4

Merge branch 'MDL-42808-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 02e45bf2695ec71370ed160086d1df1ad976a875
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:27:22 +0800
Tag:    v2.6.1

Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 79149e85fbd4ae3dfa8eef44209b0ff6bf681826
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:26:52 +0800
Tag:    v2.7.0-beta

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

commit 67c0ced049bea429e4d526cf1299c2f9b8934fa5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:37 +0800
Tag:    v2.4.8

Merge branch 'm24_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 9bd2c37acc1f03c159e5c21e52f8f6fb78631414
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:20 +0800
Tag:    v2.5.4

Merge branch 'm25_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 28fccc09ce23ab2199fbf0f16638c7c7c0ecc84a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:21:01 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-41695' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit 67016a4d392a385d33f9f067a8763ae52fe33680
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 15:12:56 +0800
Tag:    v2.7.0-beta

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

commit 7f2c374dcddda0163366d4649d6b568c7fba2622
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:55:18 +0800
Tag:    v2.7.0-beta

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

commit 22000e52b7680d2127226cd13ddd55d4a1ba1d8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:54:17 +0800
Tag:    v2.5.4

Merge branch 'MDL-42582-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit 61cdb947e8ebaf4cefd2ad3c4d68f5070e663398
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:05:17 +0800
Tag:    v2.7.0-beta

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

commit d29a7827c4c422623f58501a0b4148e0abac49bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Nov 2013 14:04:23 +0800
Tag:    v2.6.1

Merge branch 'm26_MDL-40223' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit f2f23af955d89dad13e5c83f18f2675955430f3d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Nov 2013 17:18:44 +0800
Tag:    v2.6.0-rc1

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

commit e4af9616c3335d1804ee44d1be8dffb2d2c4cad9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 16:57:34 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle

commit 6bce5b846a42faa4d20928d0f4c55f447fd84b7e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 15:57:07 +0800
Tag:    v2.6.0-rc1

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

commit b22292ed50bef899fe0703a3bdb441609d7ddade
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 14:42:32 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle

commit 175137de180ef01d54035f48ae38d20cce3c763c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 14:35:34 +0800
Tag:    v2.5.4

Merge branch 'MDL-42598_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 28177a0a07a184a3cc60e9532feb71b2421c3b78
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 14:35:20 +0800
Tag:    v2.4.8

Merge branch 'MDL-42598_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 34b67813ece9b485954000e0ed1bfd05f7f12d36
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:43:52 +0800
Tag:    v2.6.0-rc1

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

commit 2847f9c8fc17ad53ae19ade77d74ff0dc377fef8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:12:19 +0800
Tag:    v2.4.8

Merge branch 'MDL-33536-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE

commit ef9b7c943b4ff0b7283ea450911aa79e7ec8e09d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:11:19 +0800
Tag:    v2.5.4

Merge branch 'MDL-33536-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 2034716c164fcffb47f7dddc332617d6763f9688
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 13:10:42 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle

commit f51d0384f70a59bbc34481be5cbfac5a3bc97329
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Nov 2013 11:50:36 +0800
Tag:    v2.6.0-rc1

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

commit 3ebaeb11b07414aa4a19b7c0e3871d7f482c7a77
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 15:11:25 +0800
Tag:    v2.6.0-rc1

Merge branch '41392-26-r1' of git://github.com/samhemelryk/moodle

commit a6b35417c0587eb8e137a0ad50082dc6e8cb07ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 14:22:28 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle

commit e87d98d541e03b7f03b3ec360040068d995b3c29
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 10:05:18 +0800
Tag:    v2.4.8

Merge branch '42806-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 5a668a8c81799be8769cac355f895e67088f7a40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 10:04:38 +0800
Tag:    v2.5.4

Merge branch '42806-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit fae2e1ffcc206cc334a90d4b59845b6c151d14f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Nov 2013 10:02:09 +0800
Tag:    v2.6.0-rc1

Merge branch '42806-26' of git://github.com/samhemelryk/moodle

commit 2d764047ca81f0af249bc15288170aab5fbb7bc1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:25:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle

commit a97d655d8f750328fb8cea3cfbe5e35435507f54
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:17:13 +0800
Tag:    v2.5.4

Merge branch 'MDL-42803-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 16fafb9aed4893e614d12bb532cadd0f69075658
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 17:16:51 +0800
Tag:    v2.6.0-rc1

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

commit bbdb36986823be76e5d66ec4752ffd2d516973ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 10:41:40 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle

commit d5c0f0453ce823fb188e03079d4d1df024bb0210
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 10:17:07 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges

commit 75a4dd38ad68e27230f9a9a4ce9732bf06e881bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Nov 2013 09:57:36 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle

commit e3552170da68b0c63bd1a5366df01209645db804
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 16:15:17 +0800
Tag:    v2.6.0-rc1

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

commit 836ab073a3af4ee817729d84b92f4ac4ee146606
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 12:53:09 +0800
Tag:    v2.5.3

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit f8872ff3e8915b20450010dcdcbbae2c0b5b72fb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 12:50:59 +0800
Tag:    v2.4.7

Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

commit 9f213270f601d2a0a29bdf14a4aba3ab93ef9c53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 12:48:04 +0800
Tag:    v2.3.10

Merge branch 'install_23_STABLE' of git://git.moodle.org/moodle-install into MOODLE_23_STABLE

commit 16fd6fb6d7fd5635c576d40d74c4f86f4a73f729
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 11:43:10 +0800
Tag:    v2.6.0-rc1

Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle

commit 13f04e7c910d5a7eb04ec19df8d7fd4ead9a7e83
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 11:23:00 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle

commit d25e988d0821210f8b82c0d05f2ffa77a14d828b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 08:45:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle

commit a79cea102d0863175d09e2132ccf27924f449289
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 16:20:53 +0800
Tag:    v2.6.0-rc1

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

commit 301e79acaee5e54e92507901f5f159e96d60b728
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 16:11:30 +0800
Tag:    v2.4.7

Merge branch 'MDL-42668-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 5a3a53126772f529053e3182d774b7ce34acd7cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 16:10:59 +0800
Tag:    v2.5.3

Merge branch 'MDL-42668-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 81b07e655c5a017bfa41b15d7969fd6bc8a4ebb8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 12:23:25 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle

commit 711f77e4cad674c881b2ffdaf8a61c5545ce0440
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 11:05:32 +0800
Tag:    v2.4.7

Merge branch 'MDL-42605-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 9f4c5ff972345a5544db8d6f642e7fc27a92eabb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 07 Nov 2013 11:02:10 +0800
Tag:    v2.5.3

Merge branch 'MDL-42605-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit dcd02d8b0e082c4f6ef657b26e5f26e419c2083a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:42:11 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-master-fixes' of git://github.com/andrewnicols/moodle

commit 30e736cfbaf3b699c97dbe5fe678a754c3444bab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:07:44 +0800
Tag:    v2.6.0-rc1

Merge branch '42740-26' of git://github.com/samhemelryk/moodle

commit 2c366f45cafa07bff41f2218a399999f45414f68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 16:00:33 +0800
Tag:    v2.6.0-rc1

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

commit 496422e34c9a26543a6ba7c9a87ae29a52e15881
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 15:37:29 +0800
Tag:    v2.6.0-rc1

Merge branch '40975-26-r1' of git://github.com/samhemelryk/moodle

commit 951b414b658d55f76f774feeddd778d0fb2e7a85
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 13:06:01 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle

commit ee8e077a2e19ecd5c15d3bb0e825617a71aeede4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 12:07:47 +0800
Tag:    v2.6.0-rc1

Merge branch '42710-26' of git://github.com/samhemelryk/moodle

commit ac3831b422b6f015c4b4049de9ff2c6e5a763b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 11:59:41 +0800
Tag:    v2.6.0-rc1

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

commit bff2785bbbc89c63362ba171521c7431cf266ebf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 10:37:09 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41309-25STABLE' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 7fd16ca1fd51ef3f34d880748946364d6757fa1b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Nov 2013 10:21:35 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com/skodak/moodle

commit c5ae81ca38b3690ef9715ec35485a5bdafb0c55c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 22:44:53 +0800
Tag:    v2.6.0-rc1

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

commit ef7b0158c9e1f91a4264b52753d5e2c9be8ce1bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 22:39:27 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-38228-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit b7a1f7191112648288bdb1beed1a640adfb6a38f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 21:49:12 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-38228-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 9e16402727e10fbe241b42fcd0a6b0b14be260fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 14:04:08 +0800
Tag:    v2.6.0-rc1

Merge branch '42629-26' of git://github.com/samhemelryk/moodle

commit 057a79922e0d7da37b9d4092f7b6875776ad4041
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 13:10:52 +0800
Tag:    v2.6.0-rc1

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

commit 97c7b8a5483dc4e13602a1bc1619438632c7df35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 12:24:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle

commit 1ddbe7815d0d7344d48f93073252ddccf0149dd4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 11:06:23 +0800
Tag:    v2.6.0-rc1

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

commit 9995aa3852475e261fc28671326e880a8bd1068b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 09:31:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle

commit 7877f2a10d39f9883af06424728753fbe3339da1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Nov 2013 09:27:46 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-42374-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit b50bd4bcad2d8bd5f5157fbcbec1cbd0f1a16b62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 16:44:54 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle

commit a3e6f40dbe6fb2b6d27117bb50794f274d54cc9a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 15:23:11 +0800
Tag:    v2.4.7

Merge branch 'MDL-34654-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit f4dfc6aec38f0549c98dd9df6d6f50353e0285e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 15:22:58 +0800
Tag:    v2.5.3

Merge branch 'MDL-34654-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE

commit f6015bbf0203f68a423784f13bc822889dc7343d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 15:22:43 +0800
Tag:    v2.6.0-rc1

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

commit e45910aff34e21ec240d892390ea0ef3adc98f67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:17:15 +0800
Tag:    v2.6.0-rc1

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

commit 6885480643bd137bcb221c93b97f43576f709367
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:17:02 +0800
Tag:    v2.5.3

Merge branch 'MDL-42489-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 5287178537e51c34a04d653c2f8cd8458f93c82b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:16:23 +0800
Tag:    v2.4.7

Merge branch 'MDL-42489-24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit d04bea30dae4de244e0fbdba2602791eda198d91
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 13:11:42 +0800
Tag:    v2.6.0-rc1

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

commit fb494ae9c87cc569525aa60f789b583a6e2f31fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 12:05:22 +0800
Tag:    v2.4.7

Merge branch 'MDL-35146_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 1b6b8865bbee6228215c00525c8447ed9203ca40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:55:44 +0800
Tag:    v2.5.3

Merge branch 'MDL-35146_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 42fb49ae0b0c2bcf793a8ff8f751cf667e3b1756
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:53:40 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle

commit 6178bb2091dd92697c09b2e02ef3a21db7bffb6d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:33:04 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle

commit 2116cfe31b1461cad54d30f3a8ae0b567c1fd816
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 11:00:55 +0800
Tag:    v2.5.3

Merge branch 'MDL-42521_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE

commit f859f6b4e6ead40322ba9132eb414e0d1d4127ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:56:12 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle

commit 919efdf632d33d356af9ec0f5db4644fdd2212bc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:50:09 +0800
Tag:    v2.4.7

Merge branch 'MDL-42663_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE

commit 978271ca9b5682c3c2bfc7a6100f0481ea66664c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:49:21 +0800
Tag:    v2.5.3

Merge branch 'MDL-42663_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 0d0b93ce2fa8dfac6feadc00a5249f54183ed302
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:49:06 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle

commit b804196502b783d31407ba3f68bb775fb5f2af32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:37:59 +0800
Tag:    v2.6.0-rc1

Merge branch '42452-26' of git://github.com/samhemelryk/moodle

commit 3e84d1746a44aeef4022469d1e16dd4ba72a466d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 10:00:24 +0800
Tag:    v2.5.3

Merge branch 'w45_MDL-42496_m25_addonredir' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit da9e7233b97c1b175339b8376ba9813e58fea923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 09:41:46 +0800
Tag:    v2.5.3

Merge branch 'MDL-38850_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 4844fc124c7db11eaf4c428373d7542cd8f3c158
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 09:41:10 +0800
Tag:    v2.4.7

Merge branch 'MDL-38850_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 23cd687d72632edbcd58846a8204d6a750278c7b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Nov 2013 09:38:38 +0800
Tag:    v2.6.0-rc1

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

commit f21531eb77caf05e9598f449f775072ce302bd50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:39:37 +0800
Tag:    v2.6.0-rc1

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

commit 6ff3923ba85937c817194f7c1b8ec77c5300c6f1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:34:16 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle

commit e0c14e5018b9a94150e9c43ebc4e64629c6b130a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Sat, 02 Nov 2013 22:24:19 +0800
Tag:    v2.6.0-rc1

Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle

commit d98f1751e830dedadf9b726ebe3fcb49e8fdd6fb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 01 Nov 2013 22:53:01 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-28463-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 6c867463ae57940821bbcbd50a86775fd7678932
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 01 Nov 2013 21:50:15 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-28463-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit e9a20b470323776d29ba43d955ae12b7a351a235
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 01 Nov 2013 21:31:57 +0800
Tag:    v2.6.0-rc1

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

commit 1cf4616825407b2b1904685ac7fbffb3fce1d695
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 17:21:52 +0800
Tag:    v2.5.3

Merge branch 'MDL-38734-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 7b8dba0b52ac653910711323933b1c41bc39a14e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 17:21:30 +0800
Tag:    v2.4.7

Merge branch 'MDL-38734-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 3b4e5a83f4796af0805ad80ee2ab5d0a706fc043
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 17:21:00 +0800
Tag:    v2.6.0-rc1

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

commit 4323d78919efffbde0b99c4f086700a19310584d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 16:25:08 +0800
Tag:    v2.5.3

Merge branch 'MDL-41092-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit bb1a6000462dbdd6fd963fed67b07aa20acc8bae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 16:21:37 +0800
Tag:    v2.6.0-rc1

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

commit 574c1699a7851758f35b1fb45b003bf2d5e3e320
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 15:44:13 +0800
Tag:    v2.6.0-rc1

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

commit 3b4ace3ec88491dc99576e951fccf380cb7ed74c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 12:08:20 +0800
Tag:    v2.6.0-rc1

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

commit 6df3cf52c5bd52e0ed1fea77ff8be2e682d1d3a2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 11:38:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle

commit 87c3a9fd9fdb38ef0591c95f8aa238fe97f57e50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 10:54:13 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-41337-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 657faa98d8397a6418d0a0b13cbefe1f4979d341
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 10:53:52 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41337-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit da13302f918f959586322fc4922bb639a29e8164
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Oct 2013 10:31:08 +0800
Tag:    v2.6.0-rc1

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

commit e17bac441d1a5d5c7c704c8111f876a7cfc14154
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 16:42:48 +0800
Tag:    v2.6.0-rc1

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

commit 5fb9161b5e66438ce5ed18226a2fb3462e1baa81
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:57:51 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle

commit 56ed66a537b1b6dd68132326ad25c3a43bde82f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:56:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-40470-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 9ac938636f32f2821735756613c950f21498b61a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:55:28 +0800
Tag:    v2.4.7

Merge branch 'MDL-40470-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit afb5f285cdae8c1fa408b7d707cd59f0693f8e8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:44:34 +0800
Tag:    v2.6.0-rc1

Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle

commit 39ab79ca19b028f353448311826dd354db37221c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Oct 2013 13:42:58 +0800
Tag:    v2.5.3

Merge branch 'm25_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 9a84376d4b8e6e8f15bcddc1bc79b4577cd656b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:39:30 +0800
Tag:    v2.6.0-rc1

Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle

commit 59f85555122b80a2cd992c69b42460b778e300c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:14:52 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-30812-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 3a335789261cbc490fb9c58270ccf7900b98ef76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:11:34 +0800
Tag:    v2.6.0-rc1

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

commit 43fed596e5faeac7fc3f1c6a62ef355a70721388
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 12:10:09 +0800
Tag:    v2.4.7

Merge branch 'wip-mdl-30812-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit b40036ac660b804dc4591c592e74c96069bac28b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:59:59 +0800
Tag:    v2.3.10

Merge branch 'MDL-36818-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit d0a9524463c0dc5dbc53a4c0df4161d921c30bc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:59:16 +0800
Tag:    v2.4.7

Merge branch 'MDL-36818-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit b842558dc2c3af227c34986bb3d282dc4dcb4d25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:58:54 +0800
Tag:    v2.5.3

Merge branch 'MDL-36818-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 042e6a47fde715b042acef8d432e170beaf225e8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:52:41 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42481-master' of git://github.com/andrewnicols/moodle

commit 76f8eb9be955b5d50aa1a7fa0e08dad7600514ba
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 24 Oct 2013 10:29:05 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle

commit b807cc63341d861f4de7ca2ce93205a221d276d2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 14:19:42 +0800
Tag:    v2.4.7

Merge branch 'MDL-42210_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE

commit 6e81b099fb08f8881d6235ad8792580c6336de61
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 14:19:26 +0800
Tag:    v2.5.3

Merge branch 'MDL-42210_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE

commit 19becd541aa84435bd06d6266281a65b908847ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 14:06:04 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle

commit 9de894db2dc8db6a1c71c7ec569c88d6e8af8745
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 13:42:26 +0800
Tag:    v2.4.7

Merge branch 'w43_MDL-42208_m24_authunmask' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 023ab3da11f302a8cf2018c2ffce4dd664c0b1de
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 13:41:46 +0800
Tag:    v2.5.3

Merge branch 'w43_MDL-42208_m25_authunmask' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit db812f5e5abf3680dc113cfad4dc0e74a7cfbd73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 13:37:24 +0800
Tag:    v2.6.0-rc1

Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle

commit 697ecc6db1c8e175278e6b5ba106b8086d1c08ba
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 11:55:33 +0800
Tag:    v2.4.7

Merge branch '24STABLE-wip-mdl-41339' of https://github.com/jennymgray/moodle into MOODLE_24_STABLE

commit 2840c2ae62598fa20dc590b0a00c31804de13afd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 11:53:16 +0800
Tag:    v2.5.3

Merge branch '25STABLE-wip-mdl-41339' of https://github.com/jennymgray/moodle into MOODLE_25_STABLE

commit 549ce3fa76fa280b43930e0334fb8df23ef13d8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 23 Oct 2013 11:50:50 +0800
Tag:    v2.6.0-rc1

Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle

commit 5964cfdb51af10ea6930e69aa2197e291450bb62
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 18 Oct 2013 13:29:03 +0800
Tag:    v2.5.3

Merge branch 'MDL-41554-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 90b46f39a41701c576272124d09f4ae40e67ccae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 18 Oct 2013 13:27:19 +0800
Tag:    v2.4.7

Merge branch 'MDL-41554-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 85d47590ccf4119f684dfc10d20b87052f1d4940
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 15:48:19 +0800
Tag:    v2.4.7

Merge branch 'MDL-42065_24' of https://github.com/sam-moodle/moodle into MOODLE_24_STABLE

commit 5cd7d9c9fe7dc3b82068c32e626db84ba12cfb89
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 15:47:12 +0800
Tag:    v2.5.3

Merge branch 'MDL-42065_25' of https://github.com/sam-moodle/moodle into MOODLE_25_STABLE

commit 22889692695f4730443fba60dab42dee17e75eff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 15:45:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle

commit fc69508f0112288852b0e3e5628ebc4193e9445e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 12:45:07 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42029-master-nomerge' of git://github.com/mouneyrac/moodle

commit 2ec214806f84d4683da62149724416a7360b245c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 11:36:16 +0800
Tag:    v2.6.0-beta

Merge branch '42294-26' of git://github.com/samhemelryk/moodle

commit 8789750cc5fc8747dabdd7da09a30c7eb757067f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 11:16:45 +0800
Tag:    v2.4.7

Merge branch 'MDL-37528-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit 51db769bbd657c76f97a9e71626194ce52e75292
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Oct 2013 10:42:04 +0800
Tag:    v2.5.3

Merge branch 'MDL-37528-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit e81aa9e8e6d625b938d298aabe4f5ee3a8738d36
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Oct 2013 16:58:39 +0800
Tag:    v2.4.7

Merge branch 'MDL-37877-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 5d56f7d1887aea599b2b13a6fde90a2bfb0ac824
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Oct 2013 16:57:16 +0800
Tag:    v2.5.3

Merge branch 'MDL-37877-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit 2c94d858f06eda8740129d6a6f1a387ad2be260d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Oct 2013 16:54:40 +0800
Tag:    v2.6.0-beta

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

commit 6350e5df45632394dbf0897e48070d932d898f5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:55:39 +0800
Tag:    v2.6.0-beta

Merge branch '42256-26' of git://github.com/samhemelryk/moodle

commit c0c2547bf6b234c967a656792dc202c84a853ea6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:15:10 +0800
Tag:    v2.5.3

Merge branch 'MDL-42198_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 35d7ba167a30365dafc31cd95988ac6d063a3b6e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 16:14:38 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42198_master' of git://github.com/dmonllao/moodle

commit 7aeb2cc335d5ac074f6dcb34508f4cf44b2d8f80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:12:17 +0800
Tag:    v2.6.0-beta

Merge branch '42249-26' of git://github.com/samhemelryk/moodle

commit 3abdd3273b8a18c6e1542cd0c4a4b1be9671e15e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:07:29 +0800
Tag:    v2.6.0-beta

Merge branch '42255-26' of git://github.com/samhemelryk/moodle

commit 769b434ad9d86955695a03fae717a94569f6e81a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 15:04:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-42225_master' of https://github.com/markn86/moodle

commit 71c2e40993ae6ef1c68e124da4fce2283bb49e93
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:50:53 +0800
Tag:    v2.6.0-beta

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

commit 48947db1143c6859a1d966e76e4c802449b7c3ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:29:52 +0800
Tag:    v2.6.0-beta

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

commit 8afe4de64588e5268dd18b1226a9cb5f23b48ed7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:29:14 +0800
Tag:    v2.4.7

Merge branch 'MDL-34586-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE

commit f5c356d06c5efcd53214d39156dbeacbedbf6b5d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:27:48 +0800
Tag:    v2.5.3

Merge branch 'MDL-34586-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit 031a28ce7f0abb1e47395f0c7e4284b6874137b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:12:57 +0800
Tag:    v2.6.0-beta

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

commit 15ba938554b95092edca897f830a2f4870d663c7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:12:38 +0800
Tag:    v2.5.3

Merge branch 'MDL-34612-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit 7643bd4ca9764617f8c2180d423f70850f0a3b03
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:12:23 +0800
Tag:    v2.4.7

Merge branch 'MDL-34612-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE

commit 1b9f0beaf36d0f99272053254958b789378a0da1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:04:18 +0800
Tag:    v2.4.7

Merge branch 'MDL-41170-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit e6338c2c65019fee71d4321e3fe569e78b6cb21d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 14:02:34 +0800
Tag:    v2.6.0-beta

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

commit 36f60b226d3ec533d7a6ed20368d8bb186b9537c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Oct 2013 13:02:55 +0800
Tag:    v2.6.0-beta

Merge branch '42253-26' of git://github.com/samhemelryk/moodle

commit e4fc57eca598c0507f7b0f2cdb28edfa64891b09
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 11 Oct 2013 16:33:17 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41792_intmaster' of https://github.com/markn86/moodle

commit 835a006b070c669352ecfee0c528c8183a24112e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 14:04:47 +0800
Tag:    v2.6.0-beta

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

commit 982482f01a4408dc1b738664fb0dbfc4bbf5c577
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 11:11:12 +0800
Tag:    v2.6.0-beta

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

commit 370058d8fb9316a391b9cf15b375c64469ee794e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 10:49:11 +0800
Tag:    v2.6.0-beta

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

commit f0ae8d7a6608ee466f8995c51ad89d2a62703d7d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 09:31:33 +0800
Tag:    v2.6.0-beta

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

commit 80d5b253e2b45aeca0cb659adbd0eab42bdf0234
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 10 Oct 2013 09:11:25 +0800
Tag:    v2.6.0-beta

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

commit d4609de200fd316963ae520cb9abae18b0b9ec27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 14:44:25 +0800
Tag:    v2.4.7

Merge branch 'w41_MDL-42047_m24_cohortdel' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 59e180d6d78287888e96916c4e3d14e4e78c7b8e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 14:42:42 +0800
Tag:    v2.5.3

Merge branch 'w41_MDL-42047_m25_cohortdel' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit c7780855507e3b00bf93313df0839ab6cce21e8a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 14:42:23 +0800
Tag:    v2.6.0-beta

Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle

commit df253b3030f777cff975bb91ddcda738e44c4397
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:35:43 +0800
Tag:    v2.5.3

Merge branch 'MDL-41659_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 46008531289768d9e169fda4c98cd65e3dc30599
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:30:40 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges

commit 5dc182dd6e15767f7ee83bc0e3df7cfb75441c20
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:12:41 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-41967-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

commit 418d50d6a739dc69bd0cac57b06c9528d1917a80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 13:12:14 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41967-25' of git://github.com/abgreeve/moodle into MOODLE_25_STABLE

commit 6412c972e3a4ff8fdaffda5141d8d63964e32a12
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:46:14 +0800
Tag:    v2.6.0-beta

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

commit c2a2580ac9ccbe6f7b4c215cc6f8603f25ae5e1d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:09:10 +0800
Tag:    v2.6.0-beta

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

commit 5cc2c6662d242b5f4f6249b5fc9f004b4a70dfc9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 12:03:54 +0800
Tag:    v2.6.0-beta

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

commit 604fc45ee0baad885f7126f7d5451f4126feb12e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 11:48:14 +0800
Tag:    v2.6.0-beta

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

commit 869dd1fc6c3b832c6535390ab8e84003b520b678
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Oct 2013 09:39:09 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle

commit 7bfc69b0c2d15b38c0e962d64d8653528fc79339
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 16:19:25 +0800
Tag:    v2.6.0-beta

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

commit 44585a1ecde51cbb2fd8a45ec9afae9e0e7e5554
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 16:03:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle

commit 6abc1738772521007b626d41b0fb66bf984fca4e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 14:43:14 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle

commit dd94734d9a307ded1a37889933ed7dfa6a1b5c37
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 14:34:49 +0800
Tag:    v2.4.7

Merge branch 'MDL-41520-MOODLE_24_STABLE-mod_lti-completion-view' of github.com:Trii/moodle into MOODLE_24_STABLE

commit 46b46de84dbc226e174986331f2caecac0dd7dde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 14:34:03 +0800
Tag:    v2.5.3

Merge branch 'MDL-41520-MOODLE_25_STABLE-mod_lti-completion-view' of github.com:Trii/moodle into MOODLE_25_STABLE

commit 43822d89c58653d73101ebeb9af3a213757ae29c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 13:47:49 +0800
Tag:    v2.6.0-beta

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

commit 43eb9aadcd2106ff9524f0688df41e4fd1814923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 13:47:18 +0800
Tag:    v2.5.3

Merge branch 'MDL-32570-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit 786538f74f4c5c95f47462e4b3f16e252727f473
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 13:46:42 +0800
Tag:    v2.4.7

Merge branch 'MDL-32570-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit a59646ee31399450dda89ed5669a674550a101b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:49:07 +0800
Tag:    v2.5.3

Merge branch 'MDL-42122_25' of git://github.com/aolley/moodle into MOODLE_25_STABLE

commit b242214269b9bb2917df4c63720507fb11e45801
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:48:10 +0800
Tag:    v2.6.0-beta

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

commit 944cfe1dec9f0a9e409dc5fad009ab912b4bfb79
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 12:45:43 +0800
Tag:    v2.6.0-beta

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

commit 18ef6201c0c7475a8db5dea8d10a52a2c63196c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Oct 2013 10:30:57 +0800
Tag:    v2.6.0-beta

Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle

commit d4770c9f0011f35389b9a0ba36ef02f53366fd79
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Oct 2013 15:28:45 +0800
Tag:    v2.6.0-beta

Merge branch '31830-26' of git://github.com/samhemelryk/moodle

commit b085cf96d32d13e02cc7b0cfa0641746de5e1222
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 02 Oct 2013 08:42:34 +0800
Tag:    v2.5.3

Merge branch 'MDL-41955_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 190cd152a6fe2f4b52ed419ab29d984b3c78c171
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:54:27 +0800
Tag:    v2.5.3

Merge branch 'MDL-41913_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit f0233c7acd2bd56f412ebd25261649c5c89fa3fa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:41:33 +0800
Tag:    v2.5.3

Merge branch 'MDL-41882_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit a2742ff0de890c9dfbbf03396e876ce8200c076e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 15:36:25 +0800
Tag:    v2.5.3

Merge branch 'MDL-41861_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit df831ae75f92d02484880fbe519adee12f38bce4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 01 Oct 2013 14:56:53 +0800
Tag:    v2.5.3

Merge branch 'MDL-41853_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit fa8b1fa4a4b592056938110735205bd867f19f23
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 11 Sep 2013 16:55:13 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-37028-fix2' of git://github.com/marinaglancy/moodle

commit b10ce368065dd31c5057a20333ff2676354a4b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 13:48:01 +0800
Tag:    v2.6.0-beta

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

commit f1f4a860c65ad1926465683a17eff7170bfd1163
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 13:33:27 +0800
Tag:    v2.6.0-beta

Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle

commit 0e3841a2734e4487f491ba85b266c59d5be005d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:57:11 +0800
Tag:    v2.5.3

Merge branch 'wip-mdl-23335-m25' of https://github.com/deraadt/moodle into MOODLE_25_STABLE

commit b604cb81e4c216c06196135cc7722453278e7103
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:56:53 +0800
Tag:    v2.4.7

Merge branch 'wip-mdl-23335-m24' of https://github.com/deraadt/moodle into MOODLE_24_STABLE

commit 6aca3fc4192d968edfd4c1df26bf1331b7d6f1c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:56:40 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle

commit 4fae13bb5ec9136b4467261140704183aa3ed7ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:51:33 +0800
Tag:    v2.6.0-beta

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

commit b0d5d6b0bb4a8a55250755eec7c7f2b1c59bf58e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:23:30 +0800
Tag:    v2.5.3

Merge branch 'MDL-41497-25' of https://github.com/willylee/moodle into MOODLE_25_STABLE

commit a77864208e7284341461a9d448a901b630b6f342
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:23:17 +0800
Tag:    v2.4.7

Merge branch 'MDL-41497-24' of https://github.com/willylee/moodle into MOODLE_24_STABLE

commit 603913bcbb5146156c235eeb36d3f7d9300bfb76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 12:21:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle

commit cc93ed2698eb0d4b565a138f5293217a0ed729ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 11:59:29 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle

commit 3a15ac7c21f2fb92158b039f2c9f598743843514
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 11:59:08 +0800
Tag:    v2.5.3

Merge branch 'MDL-41451_25' of https://github.com/pauln/moodle into MOODLE_25_STABLE

commit 294673628e36783d75d8990d9dd5483763df042a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 11:58:41 +0800
Tag:    v2.4.7

Merge branch 'MDL-41451_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE

commit b4c6b42eb65af2485be7470876519e76497246a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:39:06 +0800
Tag:    v2.6.0-beta

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

commit d0eaa8bf493030d4ef82068163d125d744d86410
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:30:56 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle

commit 081e30341508738b6a1d611378b84c3d1f8e4db8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:30:14 +0800
Tag:    v2.4.7

Merge branch 'MDL-41626-moodle24' of github.com:StudiUM/moodle into MOODLE_24_STABLE

commit 9c8c97c53ecbef7a56e89799b2267827204e7253
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:16:20 +0800
Tag:    v2.5.3

Merge branch 'MDL-41626-moodle25' of github.com:StudiUM/moodle into MOODLE_25_STABLE

commit 934c70040c0a891d9382d4b1ee8f278ceded02ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Sep 2013 09:03:42 +0800
Tag:    v2.6.0-beta

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

commit 426cdef0bc20743961f8c6b8c12a25dc42958718
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 12:43:32 +0800
Tag:    v2.6.0-beta

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

commit 5a730d0a80b119ba5ea0ed202c54a3e86b6c7e78
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 12:11:10 +0800
Tag:    v2.4.7

Merge branch 'wip-MDL-41517-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit fa2d417f36a2d6d1fd80b58fcc465fc6ae365367
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 12:10:53 +0800
Tag:    v2.5.3

Merge branch 'wip-MDL-41517-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit d2b7eee400211e393dc4e8ed162eebd9b1b9cf3f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 11:45:30 +0800
Tag:    v2.5.3

Merge branch 'm25_MDL-31232' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 5a36d6292d7fa12c1484cbe4a2ad5dbe404f17d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 11:13:27 +0800
Tag:    v2.4.7

Merge branch 'm24_MDL-31232' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 7bb89ae04299ad63b96e54812db48ead485461d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 10:46:59 +0800
Tag:    v2.6.0-beta

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

commit 1320c3177b1f5065669c24a87bce38d45957c46a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 09 Sep 2013 10:41:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle

commit c8b1ecedc7ca85f88028891c9f8524b48409bad9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:26:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-41485-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 59abd58e9f8fb340b3ed8e2c609cd484c83b8982
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:26:15 +0800
Tag:    v2.5.2

Merge branch 'MDL-41485-m25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit fedb0325df1b832d3cdeb81c0fdb8ad896a8c770
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 12:24:54 +0800
Tag:    v2.6.0-beta

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

commit 3516b82c9d175781c1dd5b9014f4438af4be6b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 11:45:07 +0800
Tag:    v2.6.0-beta

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

commit 8a4796fbcdc2266d84af84676b4ec73effa04a6a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 04 Sep 2013 09:00:48 +0800
Tag:    v2.6.0-beta

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

commit be62e59a938401dfc0abb40558285476fc14e798
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:18:36 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26_MDL-41403_backup_reduce_memory_usage' of https://github.com/brki/moodle

commit 13ad8def1b46591832cc63d013f916d22f6ac832
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:10:13 +0800
Tag:    v2.4.6

Merge branch 'MDL-41348_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit cdecb726ec54d436d892108016d60a253f4ead7f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:09:46 +0800
Tag:    v2.5.2

Merge branch 'MDL-41348_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 050167c3e6f9a947732620582348096f9070a34b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:09:29 +0800
Tag:    v2.6.0-beta

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

commit e66c84a1572575bbffcad3355bed448f58075a41
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 16:02:47 +0800
Tag:    v2.6.0-beta

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

commit a28f43e8c7c2ba3b01064bc2bb7cc5b0fe62e9fd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 15:33:25 +0800
Tag:    v2.6.0-beta

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

commit 9591f9bc54f817294d134aaa035364df2beb6553
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 15:16:42 +0800
Tag:    v2.6.0-beta

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

commit ca83aa0b99c904fd5881f06994a771be13c25d68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:49:42 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-37564' of https://github.com/nebgor/moodle

commit e75bd18064400b07897c13c90d8b5e0089d4b38a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:38:52 +0800
Tag:    v2.4.6

Merge branch 'MDL-33472-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit a36b1f9c65e7722c29c541b20891195b4d5f1768
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:38:28 +0800
Tag:    v2.5.2

Merge branch 'MDL-33472-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit ed204cb51426e538313f4fd1e6f9733a79496144
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:35:58 +0800
Tag:    v2.6.0-beta

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

commit 7a35f9f9fcfad654e516d75889aa61de5536b791
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:29:37 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit efb7f5173a6646614eb9b0270d9bab8711a0d7e7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:28:58 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 060615d3476ee45fcbf88d84e9d8d5b264d3785f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:25:43 +0800
Tag:    v2.6.0-beta

Merge branch 'm26_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle

commit 6026b9157de6955d5e37cdf86898b7b4d9ad693c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:16:38 +0800
Tag:    v2.4.6

Merge branch 'MDL-32690_restoreMissingAssignment_24' of https://github.com/moodlerooms/moodle into MOODLE_24_STABLE

commit 6093c3ddf8f59d60709f61e0bcc6765ccb8bf458
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:16:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-32690_restoreMissingAssignment_25' of https://github.com/moodlerooms/moodle into MOODLE_25_STABLE

commit 3e248a7dc8c974d96a0360f9c4c8f4e51a8a3a06
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 14:13:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle

commit 8a1b820bc58a86ed804ef6fbfb723e5837cca392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 03 Sep 2013 09:35:16 +0800
Tag:    v2.6.0-beta

Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle

commit 80032fea02c71a3fa60ce134dc0f6f8f67621d09
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 15:26:26 +0800
Tag:    v2.6.0-beta

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

commit c932a4db7c9b87dabda628376a1c0ac82873e8fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 15:02:12 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle

commit 18839cbbdc86ef69f00b030b83d9f211098aeed2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 14:58:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-41516-m25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit fb692af13b2b24b2cdbc080548adb1abf84d0519
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 02 Sep 2013 14:56:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle

commit 771d17fbab771b8b16b8c475f6357b83864430a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 28 Aug 2013 17:06:07 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

commit 5df7c45409caf9f0ea703ce34943372105572f2f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 16:31:36 +0800
Tag:    v2.6.0-beta

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

commit ad4f3b6ce576c90df634697fed182bbfffa13f43
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 16:06:32 +0800
Tag:    v2.6.0-beta

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

commit 01209ab96bd2005788d2ce55cfb5043e03ffb95d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:57:28 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-41127-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit e3f3475079112b8ad78dd16c833f3ef52a97cae2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:55:14 +0800
Tag:    v2.6.0-beta

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

commit 8380bd08a87010d21fcc2561d5780dbcc4ef0e4d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:51:19 +0800
Tag:    v2.6.0-beta

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

commit cbd91e23e9917b9f8ee92e9dc4c81dbf03d49e55
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:29:49 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

commit 37e2954e19b5a2a37e39429298152608136b5d9f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:09:21 +0800
Tag:    v2.6.0-beta

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

commit 08d19eaeb96fd0505828747b85710321bb37dce6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:08:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-41401-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit fe3ccd7e4d09bfd387c2b81e95d9641087adc04c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 15:08:13 +0800
Tag:    v2.5.2

Merge branch 'MDL-41401-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit dc7092f7b348316c46b288620ab922152f18269a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 14:11:03 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41081-m26' of git://github.com/samhemelryk/moodle

commit f5a791ee7aabb20229bc12d92f4c8f6474c80deb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 13:36:38 +0800
Tag:    v2.6.0-beta

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

commit f6c2af867fd106990bd6d648a1b68a8610c4a9b2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 13:16:55 +0800
Tag:    v2.6.0-beta

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

commit e4e617356864c9a8ddbf32e9943ec7e53567c859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:50:04 +0800
Tag:    v2.4.6

Merge branch 'MDL-40877-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 5212cb7d8fd8726e964d12128a417bbeb57b339c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:49:36 +0800
Tag:    v2.5.2

Merge branch 'MDL-40877-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 92058753ace96bdbf67572ff9103ed0e1cdce4d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:46:23 +0800
Tag:    v2.6.0-beta

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

commit 58605be7f21b6ec2e50f1f7709c1c9fb83a77bd6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:29:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-40447_M24' of https://github.com/nadavkav/moodle into MOODLE_24_STABLE

commit 082b0866bcb9c30364efff75ff626ee636a4ab27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:29:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-40447_M25' of https://github.com/nadavkav/moodle into MOODLE_25_STABLE

commit 7316f46a23d83c7a0352cb7f8b33717aa75b58c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:27:47 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle

commit 58e6ac1e9a8d2840b9a6298d9d557aa31bf947f1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 12:23:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle

commit ab2a4e356232a998002fbaca520bae1a5b960236
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 10:08:19 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-40321_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

commit 37bb910633133180d0dcdaacf69d4a4ea4f3df2b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 27 Aug 2013 10:07:07 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle

commit 33fec82b0a205e12d53165cfa3bfbd04e6148b58
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:20:47 +0800
Tag:    v2.4.6

Merge branch '41213-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 6472bbfbc7d14fef518e5e5b6270caf013c31bab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:10:02 +0800
Tag:    v2.5.2

Merge branch '41213-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 9e179acfd36e9a32399407823ba0718a2ad797f3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 16:00:35 +0800
Tag:    v2.6.0-beta

Merge branch '41213-26' of git://github.com/samhemelryk/moodle

commit 5db088a3cb779ed773651a5f0cd79e8c8c581891
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:59:51 +0800
Tag:    v2.6.0-beta

Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

commit 1e275366464e2cbeba2c9091469d34ba32debc39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:51:21 +0800
Tag:    v2.4.6

Merge branch 'mdl24_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_24_STABLE

commit 879330c428621072f9a5293d7f2f2d705bd87b3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:50:54 +0800
Tag:    v2.5.2

Merge branch 'mdl25_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_25_STABLE

commit 1b9db0af41d414c89042b8eeeac4fbd1d7846a07
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 13:50:20 +0800
Tag:    v2.6.0-beta

Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle

commit 97c91725d1b02d4dcffe1b28828525f87f08bf1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 12:42:15 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle

commit 4e66dc96b353c5274e37aa5f29593858bcf4fe33
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:44:17 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 29b8db0e0b237e3f00559cfb41bf4f4c6c606487
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:43:58 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-41106-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 2d55bee19166fea93024a6de6168f8a8e1c634e1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:43:06 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle

commit 527b36b905c6b1d762af8a297d2755b6feb1454f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:33:41 +0800
Tag:    v2.4.6

Merge branch 'MDL-36803-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit c12ec889faa4dda307396912d01179a92ff4fa1f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:29:53 +0800
Tag:    v2.5.2

Merge branch 'MDL-36803-m25' of https://github.com/andrewnicols/moodle into MOODLE_25_STABLE

commit 8920b2e288a307776f47a96623ea022d19b2df73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 26 Aug 2013 09:27:57 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle

commit c951ff9d39a0e4191f5639368c354ccafc6336dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:23:17 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41196-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 6bd0ce14ed081af6ba29e0dad85cf3c664fa5042
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:21:46 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-41196-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 50cb89177e4e4253a07c8fa91f3212303cc6a1eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 22 Aug 2013 11:19:55 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle

commit 52ec2a60f60ad8e10d7ebb8d007ecea90bc03d1b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 15:43:23 +0800
Tag:    v2.6.0-beta

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

commit 1f1bee6fbf512289e0a1b7b26597207bf1579b3d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 14:05:13 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle

commit 90a5a4b620f90b65595aa1f2119219998abda767
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 21 Aug 2013 11:38:37 +0800
Tag:    v2.6.0-beta

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

commit 89959d9ad158e31fb62d49ba6bf93786dad9caeb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:45:33 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

commit 86cef7fbcabb3230ba99b73f9c283d9e50b50d6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:18:36 +0800
Tag:    v2.4.6

Merge branch 'MDL-41191-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit fa2a822a17eb5279721fb73eeca75f95b5f91b75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:15:14 +0800
Tag:    v2.5.2

Merge branch 'MDL-41191-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit e2f36a71a83e4c802a0634e79e59f5b6c876edc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:13:55 +0800
Tag:    v2.6.0-beta

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

commit 93e2c2a567b17314c532f89010e6a7eeee06a810
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:10:49 +0800
Tag:    v2.6.0-beta

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

commit a446d62d977c133f18e23d7be7c3747408bd84cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 16:01:12 +0800
Tag:    v2.6.0-beta

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

commit f669d36b696c135bc1582308fead5b33deae1e76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:57:59 +0800
Tag:    v2.5.2

Merge branch 'MDL-41071-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 57cef30e42eed974e01819d058609f73ce240a49
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:51:57 +0800
Tag:    v2.6.0-beta

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

commit 531110c8905cd964739d4754e66b6523d7dab51f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:22:34 +0800
Tag:    v2.6.0-beta

Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle

commit b1cd2f8248a55c55fe51a1545ca915f9ea0df569
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:21:43 +0800
Tag:    v2.4.6

Merge branch 'w33_MDL-41112_m24_cachedist' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit 19ad0a365856f9bc4de3ec61406f9b033cf65e6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 15:15:40 +0800
Tag:    v2.5.2

Merge branch 'w33_MDL-41112_m25_cachedist' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1e28defac57184cad7c667785b523ac61e1a12b1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:49:08 +0800
Tag:    v2.5.2

Merge branch 'MDL-40162_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE

commit 6f81158a7e4a2b24e8a8c75f2ea58aa407839db5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:45:34 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges

commit 5a10d2a7ae0d87b4517fd994ddb2519e28a52f01
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 14:40:42 +0800
Tag:    v2.6.0-beta

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

commit 59c487a7f3f2f82835aa597d7d2e6a9f1e07b5f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:53:52 +0800
Tag:    v2.4.6

Merge branch 'MDL-27595-2_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE

commit fe8c182f0a1288c3d7d41cefb8b2f097d6350915
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:49:04 +0800
Tag:    v2.5.2

Merge branch 'MDL-27595-2_25' of https://github.com/bostelm/moodle into MOODLE_25_STABLE

commit eedb6aae3fdefae48ea1f0a6669912712745c92d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:31:16 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle

commit 18c49b1420849f75591221b947d8860380adb1d4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:02:26 +0800
Tag:    v2.4.6

Merge branch 'MDL-41036_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 32fc11d77aa5d1b555b3c3a5590ed8a095a7a715
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 13:00:54 +0800
Tag:    v2.5.2

Merge branch 'MDL-41036_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 43cc62ed139f29d5a526044dd541958f6d006b68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:55:31 +0800
Tag:    v2.6.0-beta

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

commit d161d6bbe93cdf0d3045c3f23d36b0f13add39ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:30:43 +0800
Tag:    v2.4.6

Merge branch 'MDL-41122_2.4' of git://github.com/kastashov/moodle into MOODLE_24_STABLE

commit bf3ed270ec7a19f8fcf2236622e866744ea55627
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:30:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-41122_2.5' of git://github.com/kastashov/moodle into MOODLE_25_STABLE

commit 5a2356be38204bfe8a62a7a11d3db8ce5faf3cf8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:28:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle

commit b277230aadc917693d9c03871e001ea5ad535daf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 20 Aug 2013 12:21:04 +0800
Tag:    v2.6.0-beta

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

commit 7452709d699925425614f2aac0e197854e2ae25d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:44:17 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-39572' of https://github.com/totara/moodle into MOODLE_24_STABLE

commit c67f7093a4cfe6b3f0dc02c7700ac99054a4fa5d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:43:59 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-39572' of https://github.com/totara/moodle into MOODLE_25_STABLE

commit e5cb7f8b7b560cf1d804c7853aad012d9a04d02e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:42:17 +0800
Tag:    v2.6.0-beta

Merge branch 'master_MDL-39572' of https://github.com/totara/moodle

commit 26ae471585d43e7af404cf8235d50c84a4865150
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:38:23 +0800
Tag:    v2.6.0-beta

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

commit 97557f92f3a81aa3a071162fb55e43ac73669475
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 15:38:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-40896_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 79b958a4a747840888ed4ebbbe4bcec7cb128c25
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:51:42 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 4fea0a3490c2bf4669b5e674f14c6579f869549c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:51:25 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-41106-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 3415e1ca59795b03683807efbab79b3db4351419
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:50:46 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle

commit d51f9d5fd044a4389c1fd5f59e0f64437ce725e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:29:55 +0800
Tag:    v2.6.0-beta

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

commit 07cafa966a9955e15df40862cfbf060fd7b5b40d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:17:03 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-36789-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit c93707771fc255712968b15ed25b7e9e6b427362
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 19 Aug 2013 13:16:39 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-36789-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 7d6f0b8224fcd8ec55a6ce2340c5f2057f9a448d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Aug 2013 09:02:41 +0800
Tag:    v2.4.6

Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MDL-34989-24

commit 0b92270b197b826fd142e3c42bb70335cc22b2b9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 16:04:50 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle

commit e2bb8c1bbd688a7d26a8ee927ff067e295d65335
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 15:54:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-40295_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 0070cb8bca5d75ba91087a44ace14d0a195f4032
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 15:51:59 +0800
Tag:    v2.6.0-beta

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

commit 6064e5cc006de79535b5ace1a97ec5a8029c3b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 14:49:42 +0800
Tag:    v2.6.0-beta

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

commit 7ea41b4a94da069855821586a7466370c02c826d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 14:16:31 +0800
Tag:    v2.6.0-beta

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

commit 9ced78bd3ec8050f969d1ec4758ebcdca04ffde2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Jul 2013 10:37:20 +0800
Tag:    v2.6.0-beta

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

commit 4cf35a316ecaa3f45b133328ce173931cd0c8730
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:16:27 +0800
Tag:    v2.4.6

Merge branch 'm24_MDL-40260' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit 1ab82c67751425193ac9148eb635c73c12fbb192
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:15:05 +0800
Tag:    v2.5.2

Merge branch 'm25_MDL-40260' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit e3a96804effb15cbe6b444a8ef9e20ea8f5e91fb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:09:29 +0800
Tag:    v2.6.0-beta

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

commit a04662aad4be2903cf4c1af11422904451d4a1b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:04:40 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-40174-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit d99508f25b19de059e153cc3c3abf3a98256852e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:02:47 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-40174-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit bbc8485708b32afb21619d841a5f1bc271179912
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 16:00:41 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle

commit c31909cb69f050ba6492291d04e1b98d24dedd6f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 15:05:53 +0800
Tag:    v2.6.0-beta

Merge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle

commit 91313e43ca7201e12609e1479ad599a955ab60e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 12:11:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40649_master' of https://github.com/markn86/moodle

commit c39423139d7be51f1640712d6705181205b6254f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Jul 2013 11:47:21 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40468_master' of https://github.com/markn86/moodle

commit 4217cea494fe5ec3cc70a5305af7c14bd7613e6b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:25:04 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE

commit 855b35604d75bbafaca647fc521fee69b5baa8ac
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:24:02 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 6d1ebb59ddb07429c17fcc3d30c462a2a15f28fa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:22:18 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit e4ef98006fca94c1015ba0f0c4fe95798facffe7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:19:29 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 1d1f7ac81f9bba304b24629b21cf232c29d6ccd9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:59:47 +0800
Tag:    v2.6.0-beta

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

commit 3fd74243a741e7240ba3e47135fa7a92cb5aea1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:51:19 +0800
Tag:    v2.6.0-beta

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

commit 820ad5dfd87f1f42132a4d0a0a9bbda62d98b715
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:35:38 +0800
Tag:    v2.6.0-beta

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

commit 4474895d37bbf487ee96e909eabe18d50c22e7df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:31:52 +0800
Tag:    v2.4.6

Merge branch 'wip-MDL-40621-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 9dafb1ba898aa61d754f35d8a06a365afbc619f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:30:29 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-40621-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit b30a12db52b2060427b57746362f7ac08f76c127
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:29:58 +0800
Tag:    v2.6.0-beta

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

commit 59e649180d5649fb277ea54171725d563b7a2594
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:23:30 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle

commit e1982a25cdf51f203872b2004ce35a0687d043f5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 21:14:45 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-39299-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE

commit e202521f2534684275ac50b22a6ccf8fa293b809
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 20:59:41 +0800
Tag:    v2.6.0-beta

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

commit 259e3c25250077c8cc3953f7a82a5d87e761aa2d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:44:38 +0800
Tag:    v2.6.0-beta

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

commit 924ea4845ab771a82e9c9e7f09075e3417c885ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:14:49 +0800
Tag:    v2.6.0-beta

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

commit 06c8b60936f4d3bc5a41c8feaa01d1bae2ae2019
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 15:00:46 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle

commit ed9e492087dc445c39a87a652741edf311044c88
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 14:49:25 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40431_master' of https://github.com/markn86/moodle

commit d981272e64b81a46259d3c1a8061d6ad96132e27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:33:27 +0800
Tag:    v2.6.0-beta

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

commit e811b5fbe181031724a37e1b9535063491d7557a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:29:38 +0800
Tag:    v2.5.2

Merge branch 'MDL-40195_25' of git://github.com/aolley/moodle into MOODLE_25_STABLE

commit a2de489c3ec5db792a9d89146b5e7517cf8e8cde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:29:19 +0800
Tag:    v2.4.6

Merge branch 'MDL-40195_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE

commit 539819dc40012b429062ae8726c780cf9a386ead
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:28:52 +0800
Tag:    v2.6.0-beta

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

commit 6ec1f2f2ebef58fe351806b700c0348257d676c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 13:25:54 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle

commit 994d7ebdc35b1add9ca895b909abf892fa5b36df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:29:28 +0800
Tag:    v2.4.6

Merge branch 'w29_MDL-40558_m24_guestdelete' of https://github.com/skodak/moodle into MOODLE_24_STABLE

commit f352c87f677e8f56156d17ffef611b77461d8ab1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:29:14 +0800
Tag:    v2.5.2

Merge branch 'w29_MDL-40558_m25_guestdelete' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 8eb3e1f94f9463708f8b652f012c5ad5931e2b68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:28:57 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle

commit 2f9aeafe5ecab89c68477358dc409e2137ff9c75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:24:06 +0800
Tag:    v2.6.0-beta

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

commit 4d4fb80d8fe27bbf572c65a174c57e9d88079241
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 11:02:54 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40538' of https://github.com/mr-russ/moodle

commit a7228f586b7eb0e52dbc9f321b40c66fbd0ab026
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 10:26:56 +0800
Tag:    v2.4.6

Merge branch 'MDL-40538_24' of https://github.com/mr-russ/moodle into MOODLE_24_STABLE

commit edb2b3c8a04347dba37eda440ef60d4844cb06c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Jul 2013 10:25:14 +0800
Tag:    v2.5.2

Merge branch 'MDL-40538_25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit ae5e95af2db4bac0023b3422af2e801f475fa9f0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 15:06:08 +0800
Tag:    v2.4.6

Merge branch 'MDL-39563-24' of git://github.com/jleyva/moodle into MOODLE_24_STABLE

commit 4d4b938fa3143ea4d29fdd0e59146306cd2cc20f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 14:54:20 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39563' of git://github.com/jleyva/moodle

commit d7bf5fd1f73d76c06785b7e83c930184bf11d86b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 14:42:10 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40440-m' of git://github.com/andrewnicols/moodle

commit fff9752d2aa7c23ae33d0a040df4eae2a97439d4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 11:54:24 +0800
Tag:    v2.6.0-beta

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

commit c49fea3be50d5cda6cd84025e21da199c969715e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 11:25:37 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle

commit 527b24b104364f53d41fd6595792e62c18a651c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 10:58:03 +0800
Tag:    v2.6.0-beta

Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle

commit 5034db3e9f460136c0350cd09a05bf9142928105
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Jul 2013 09:55:44 +0800
Tag:    v2.6.0-beta

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

commit 3afab77ad639725026f1ad0aeed7e1811ba505d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:43:13 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE

commit 95455fc76aa56376007eddfa6f37b59b01338bb4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:42:53 +0800
Tag:    v2.4.6

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit e670f3e8c275a4c35f05710af1325ee9b681a72d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:42:35 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 779545e7fda125e378ed0e3a797bf1358b6829de
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:41:55 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 4dcd07386464fada36d778d897376ff1c7245fcd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:44:21 +0800
Tag:    v2.4.6

Merge branch 'MDL-39420_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit c6df1f5ad0b21cce0843071d0a56f7fec56ba94e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:43:54 +0800
Tag:    v2.6.0-beta

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

commit 94fbefa96b8e1e443d1156da123813474f2e46c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:43:43 +0800
Tag:    v2.5.2

Merge branch 'MDL-39420_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 218f77841739bbe56f318ca8d5a7943045024251
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:30:12 +0800
Tag:    v2.5.2

Merge branch 'MDL-36479_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 57cf73a8255fd165d6106576897f7125b14d5d16
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:28:51 +0800
Tag:    v2.6.0-beta

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

commit 800c5757c30a7acc209aa1eb1a4b53c7a50dea8b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 22:27:59 +0800
Tag:    v2.4.6

Merge branch 'MDL-36479_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 641595c1fa74d2acc2e5f154f650daad428e02d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 21:52:07 +0800
Tag:    v2.5.2

Merge branch 'MDL-40392_25' of git://github.com/stronk7/moodle into MOODLE_25_STABLE

commit e9319545589243ea453ae56715afd3092fe9f850
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 21:51:41 +0800
Tag:    v2.6.0-beta

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

commit ef5fd5bf4044fcf0ef94bac7b0f1692009071f4f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 16:05:02 +0800
Tag:    v2.6.0-beta

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

commit a6673a8b04357456adb12b0808e95c30fcba9750
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:28:31 +0800
Tag:    v2.6.0-beta

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

commit bc90ad107ae07c3c90b2e0e4ac1868083d3079c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:20:07 +0800
Tag:    v2.6.0-beta

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

commit 1f304be72c06db1002bf09cf00eef6cda1b82bd5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:16:32 +0800
Tag:    v2.4.6

Merge branch 'MDL-40443_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 234d90b20945fe9fc8d985991f649c0403e8f1d8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:16:16 +0800
Tag:    v2.5.2

Merge branch 'MDL-40443_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit de0a6ed45994aa99be89a0672794c22f44dbaa4c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 15:15:47 +0800
Tag:    v2.6.0-beta

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

commit 8a011a9f0a472a5c0e6c7060104db698ba49e84e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:44:01 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle

commit c2bee5e0d13179dddeb84176be4b6a96372efd60
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:33:42 +0800
Tag:    v2.6.0-beta

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

commit 10061c1de79263e9e794db8f230a75cd9c18f820
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:27:28 +0800
Tag:    v2.5.2

Merge branch 'MDL-40499_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE

commit d3dc9a334ceb295d598774d7a9c65840342b9851
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:27:05 +0800
Tag:    v2.4.6

Merge branch 'MDL-40499_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE

commit eb729e0391f56c909dc3cf8a76dfc9257091c145
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 13:26:49 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle

commit a16698d10bb8c0b7c00c2fdaf772cfae1b75cf13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 12:34:52 +0800
Tag:    v2.5.2

Merge branch 'MDL-40386_25' of https://github.com/prateeksachan/moodle into MOODLE_25_STABLE

commit 26616e4b6ddf50dfde7b89d0b9ce7a0efaf73988
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 12:34:31 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle

commit b7aac8b6d16ae14f0ab791424611a79745de082e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:13:23 +0800
Tag:    v2.4.6

Merge branch 'MDL-40318_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit d5e3d9a06dfd5b4aeff0844a73fe54f3af73e218
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:12:19 +0800
Tag:    v2.5.2

Merge branch 'MDL-40318_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

commit 9d871499fe08017ec3c6c02b199b9aba60de8716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:11:42 +0800
Tag:    v2.6.0-beta

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

commit 79fd52c6c3cb153dfb2e67ef3c7728fa2a8e07bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:05:39 +0800
Tag:    v2.5.2

Merge branch 'MDL-40562_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 9ac5809512478717685d472e92bcf3e1e7ccb557
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 11:04:58 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle

commit 35a8f0cb7762cdb555554167a42d57150e309e48
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 10:48:47 +0800
Tag:    v2.6.0-beta

Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle

commit b080d5b6882b1dde5b446768a4b9257a1ce55345
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Jul 2013 10:03:22 +0800
Tag:    v2.6.0-beta

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

commit 15b726d584e77bc7279195c338f824b2e6bad924
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 22:28:21 +0800
Tag:    v2.6.0-beta

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

commit 92cfad95c8bb953b4120daca90aec7d1701b1aeb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 16:40:39 +0800
Tag:    v2.4.6

Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 51cefce972237d79007eede098743fa55d399d0e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:16:42 +0800
Tag:    v2.4.6

Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit ca4077c79ddc72a76bd845b5f570a9cd7c0d0c51
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:14:55 +0800
Tag:    v2.5.2

Merge branch 'MDL-38314-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 64830bf658763b096dd891cb4b0028c1decd8f64
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 15:10:58 +0800
Tag:    v2.6.0-beta

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

commit 3536560eff32a61a35021a2330d028c9a2754bc8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Jul 2013 13:40:09 +0800
Tag:    v2.6.0-beta

Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle

commit 24e13d4283909a6f4018b35efa08c8c805f167ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Jul 2013 11:35:53 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle

commit f48f4827d1837464feb69f4318ca5ef7915c4356
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 15:23:38 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle

commit a251526d72d4a898e25aae3a5c81949aac6f8f01
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 14:29:46 +0800
Tag:    v2.3.8

Merge branch 'wip-MDL-40353-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

commit 955172a5a03729883f50b1c6d451289a28eca88e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 14:29:28 +0800
Tag:    v2.4.5

Merge branch 'wip-MDL-40353-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit 1e6919f6c8f791a544ce70c40d91f0ffd6d1e7f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 14:29:08 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-40353-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 1fd351c207e3545dea8b0ad92f43acfffb993a04
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 14:28:46 +0800
Tag:    v2.6.0-beta

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

commit a57885a651679ef8f09659725f2354d0fcb6be1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Jul 2013 11:00:33 +0800
Tag:    v2.6.0-beta

Merge branch 'w27_MDL-26943_m26_localsubplugins' of https://github.com/skodak/moodle

commit a4e0171b2c620111cd50925a97e042755a5660c0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:27:46 +0800
Tag:    v2.5.1

Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE

commit b78cd7b0c92c9db02e529a81b8f3cd78e981ed59
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:27:20 +0800
Tag:    v2.4.5

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit c5fd8a39f2846503a2b2075a0ebdb752e93cf1df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:27:00 +0800
Tag:    v2.3.8

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 464c85dba8f2f2f2518db18142e9228f9cd6269b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:26:38 +0800
Tag:    v2.2.11

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 455d2042017c7e8b12aee27e0acdf29201c37e7a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:25:54 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit e750fcc4daa55598161505f67ed60f9470ea12e3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 11:13:43 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39702_master' of git://github.com/dmonllao/moodle

commit 0f1f60136858622778ef1012f4d7cb9c7ac83943
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 11:12:43 +0800
Tag:    v2.6.0-beta

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

commit cb7c21af807519dc697ce4453e61e1eb650e95c2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 09:57:15 +0800
Tag:    v2.6.0-beta

Merge branch 'w22_MDL-39802_m26_deletedusers' of git://github.com/skodak/moodle

commit d3aeeb93c28b8843cd95c3c03c4bfd20ea9cb4f9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 09:56:08 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-39802_m25_deletedusers' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 4fffc06f654b193d675edf79f02a33b9bbb863da
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 09:55:50 +0800
Tag:    v2.4.5

Merge branch 'w22_MDL-39802_m24_deletedusers' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 25534fde40a2d0314a13a846f1ba300dbcfef252
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 May 2013 09:55:41 +0800
Tag:    v2.3.8

Merge branch 'w22_MDL-39802_m23_deletedusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE

commit e6302a3c759c95edf0a2452a1aa114f5d9359d99
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:29:00 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle

commit a665577b37edf1e800f2a2015a049e1f5f8dd41f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:28:48 +0800
Tag:    v2.5.1

Merge branch 'MDL-39686_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit 1833a3c4494b037050252c97ded3de0296fd5948
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:24:34 +0800
Tag:    v2.6.0-beta

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

commit f32e55c8d7d945ad14e4c0313ca76fe7c975e1a5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:21:44 +0800
Tag:    v2.5.1

Merge branch 'MDL-39680-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit ec928e8c142e411b5fbd0592f612276dc7d38581
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:17:19 +0800
Tag:    v2.3.8

Merge branch 'MDL-39640-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 1deb9c4d18c9b4471f9a246322aef623f50ddf27
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:16:45 +0800
Tag:    v2.4.5

Merge branch 'MDL-39640-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit d059d80ea681b5db2e673b57782d490a578f60a0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:15:51 +0800
Tag:    v2.6.0-beta

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

commit 6a3a3bd868670fb0289b30d6284b34b3cfa35cf6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 May 2013 16:14:59 +0800
Tag:    v2.5.1

Merge branch 'MDL-39640-master-int' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit 93f645f0ae966f22d93ab6f88b80f488cccfd66d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:12:11 +0800
Tag:    v2.5.1

Merge branch 'install_25_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_25_STABLE

commit 5c9ce5a28110ce4b836f8a6c85e566bf88f73345
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:11:49 +0800
Tag:    v2.4.5

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit dc3d236a4b233f01c68c34fe696c0840aa67342c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:11:32 +0800
Tag:    v2.3.8

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 94a943f31cf406f88675dd0dc2bb39cfcc34623d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:11:18 +0800
Tag:    v2.2.11

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit c0db7cbe50c389f04fb9f5d1117955b12be5d368
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:10:53 +0800
Tag:    v2.6.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 49125bc5095cb651be710830ccba743d86ed460f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 22 May 2013 09:06:29 +0800
Tag:    v2.6.0-beta

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

commit d74f740722baacbe85e7bfcb59446fd8b97713c7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 22 May 2013 09:03:31 +0800
Tag:    v2.5.1

Merge branch 'MDL-39697-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit b27636c4db3112391ca3cf13de02e43f40c0a3c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 16:13:15 +0800
Tag:    v2.4.5

Merge branch 'MDL-38498-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 5cc84acabed6d4825bf7864e027ace575c4324b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 16:12:34 +0800
Tag:    v2.5.1

Merge branch 'MDL-38498-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

commit b346553fda6aeb60b33cc55ddcd3252d28004e08
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 16:11:59 +0800
Tag:    v2.6.0-beta

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

commit 166e25fec732388d862d71386a6ce74618b027fa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:17:19 +0800
Tag:    v2.3.8

Merge branch 'MDL-39363-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

commit 512f5d90863861c08f405f381ce106738d2339ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:14:35 +0800
Tag:    v2.4.5

Merge branch 'MDL-39363-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE

commit 76f881c83a8c03c9fc524f8413e68e0e94f0b255
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:13:09 +0800
Tag:    v2.5.1

Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE

commit e872912d1c15ce8552fab654895341503a6901f5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:12:23 +0800
Tag:    v2.6.0-beta

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

commit c4500213d67ec4286be250e58ba995d67bc7ce84
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:06:51 +0800
Tag:    v2.5.1

Merge branch 'MDL-39528_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit e8dc568b1271722241c6b792d9843f8942ca9c80
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 May 2013 12:03:36 +0800
Tag:    v2.6.0-beta

Merge branch 'MDL-39528_master' of git://github.com/dmonllao/moodle

commit d981c4b0fac3d70aee3f6254e79bc327a50e4475
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 May 2013 12:12:01 +0800
Tag:    v2.3.8

Merge branch 'MDL-28250-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit d8581a236794467ec4156ff73a61646ab5540530
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 May 2013 12:11:31 +0800
Tag:    v2.5.1

Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

commit a1972f5717adc0b0c129d5a401b7983fddf88d9c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 May 2013 11:49:08 +0800
Tag:    v2.4.5

Merge branch 'MDL-28250-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 2d1ad229da73844136b6a79a133b326c28246b67
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 May 2013 11:36:09 +0800
Tag:    v2.6.0-beta

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

commit b7bbb615d7e02983468ad769234d0b6e3d3b106a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 16 May 2013 15:55:45 +0800
Tag:    v2.5.1

Merge branch 'w18_MDL-39678_m25_yui' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 6fadab94f0b5790b236aa96012c47e1804ef5858
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 16 May 2013 15:53:48 +0800
Tag:    v2.6.0-beta

Merge branch 'w18_MDL-39678_m26_yui' of git://github.com/skodak/moodle

commit 5a378479a030af27439bb375d12e27513255f2bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 15:25:46 +0800
Tag:    v2.5.0

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

commit a9dcf2db60324854cd2b965a1a778c2c1df56569
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 15:08:25 +0800
Tag:    v2.5.0

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

commit d458718f59de8ca648c6b96d44c25b9da8fb8da3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 14:16:05 +0800
Tag:    v2.5.0

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

commit c938b909ba873bc19cb2f4f6462de6b3216f7716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 May 2013 13:33:25 +0800
Tag:    v2.5.0

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

commit e1559b58e89780b5e9b79385792c3ea49443555d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 16:43:49 +0800
Tag:    v2.5.0

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

commit 826cf99fb8fa59f049c758459bd7111922999802
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 15:10:49 +0800
Tag:    v2.5.0

Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges

commit a02e36d68230edd9910ade031662b08aa08faac7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 14:59:37 +0800
Tag:    v2.5.0

Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges

commit 2c59e0ffaa830ebb0eb1b4038cb9a6e5a4758e13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 14:05:30 +0800
Tag:    v2.5.0

Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle

commit 509c81cf07649f9786797599575a9931604d3316
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:43:07 +0800
Tag:    v2.5.0

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

commit 03d839c2706b9113e6597bd844a6e22d471ee5d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:28:27 +0800
Tag:    v2.5.0

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

commit d9ffe3f9450cc51d2f7c06712118941122e0e6ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 13:22:32 +0800
Tag:    v2.5.0

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

commit 8b4c865543a1058c4bd6710e8c96384e0c18f8f8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 May 2013 11:59:29 +0800
Tag:    v2.5.0

Merge branch 'wip-MDL-39526-m25-p2' of git://github.com/samhemelryk/moodle

commit 4a727367e729f65d449abe7f23a7c5560a14c05c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 10:38:37 +0800
Tag:    v2.3.7

Merge branch 'MDL-39535_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

commit b97e174acf572af28df2bb7aed11c18f50812542
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 10:32:19 +0800
Tag:    v2.4.4

Merge branch 'MDL-39535_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE

commit 1248133f7c77684663737c6a16ce38ebdc36db01
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 10:30:51 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39535_master' of https://github.com/markn86/moodle

commit dec909fcdd357344ebb9a22843e52474059fb884
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 May 2013 09:35:44 +0800
Tag:    v2.5.0-rc1

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

commit 944602889021f12ac7c1f3dc9f38d4d097ea20d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 13:48:41 +0800
Tag:    v2.5.0-rc1

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

commit 887e724796908ecbdbc5008f94766331ae71deec
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 12:33:32 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39526-m25' of git://github.com/samhemelryk/moodle

commit 8d7f911c963e3f82e2d2933c6f3ae6b28b6b3f03
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 11:32:47 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-39436-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

commit c8f7f2b5f3013940021160d16c71c48209ad0b11
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 11:29:33 +0800
Tag:    v2.5.0-rc1

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

commit 3f999f8120f24c2fea2e23578869634aee17c058
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 10:26:07 +0800
Tag:    v2.4.4

Merge branch 'MDL-38289-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 8cfc9d75ed309bff02440cca2edbba8a262fb11b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 May 2013 10:22:16 +0800
Tag:    v2.5.0-rc1

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

commit ce3fa5931dbcb297602b64beb3daf2689e3e7f7c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 15:28:24 +0800
Tag:    v2.3.7

Merge branch 'MDL-31193-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit 781383a9467ecf65e99a95576229660542f25bce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 15:23:24 +0800
Tag:    v2.4.4

Merge branch 'MDL-31193-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 35aba517589803709888570486f5b295198d8d39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 15:21:47 +0800
Tag:    v2.5.0-rc1

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

commit 9a2cc7b6c83b73c6df9d9a9c4a7be9403e343bd0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 14:57:49 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39388-master' of git://github.com/ds125v/moodle

commit 59add07d01d272deb87e97f3c027f2247272735c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:51:00 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29472_m' of git://github.com/andreabix/moodle

commit 8ed91fdabb957e58e318bdc9fa3119f87527ff40
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:47:44 +0800
Tag:    v2.5.0-rc1

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

commit 6f9e83e892096818f191228a042fe46bb1bb536e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:44:46 +0800
Tag:    v2.3.7

Merge branch 'MDL-37552-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit cf0d08f6619660d17843f3b2bea0d13fac73aa1b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 May 2013 12:43:52 +0800
Tag:    v2.4.4

Merge branch 'MDL-37552-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 5946813506be1cef6b646b3ec6ddb00c0517c88f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 23:06:09 +0800
Tag:    v2.5.0-rc1

Merge branch 'master_MDL-38102' of github.com:totara/moodle

commit 670fd5aad4e3f864a28176cc7e7b41cc912f38b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 16:09:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39187_master' of https://github.com/markn86/moodle

commit b8401ee7ac94a710ac684b533e7d448bcdb99be8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 15:31:41 +0800
Tag:    v2.3.7

Merge branch 'MDL-31713_override_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit 06340a114f1d9c9b8accd9193b001b5f56331e2b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 15:31:03 +0800
Tag:    v2.4.4

Merge branch 'MDL-31713_override_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit d285e5e628b23012886aa60ffcccb875aa37c2ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 15:28:17 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-31713_override' of git://github.com/andyjdavis/moodle

commit fc075899e061f27d13197650418635316d879f26
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 14:09:56 +0800
Tag:    v2.5.0-rc1

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

commit 98b2443961f04c1d84d235eeb22b80a342382923
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 12:43:50 +0800
Tag:    v2.5.0-rc1

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

commit a13512839062e9f7cedc7e975b3b67e5662ebdfd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 11:25:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle

commit e0fc61f993f1a7926d25ed0ed1ffe2df78ae62c3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 May 2013 10:41:44 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39162' of git://github.com/totara/openbadges

commit 14cd6479de0614c6b6653c299ee3bd789a9ed39e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 22:27:41 +0800
Tag:    v2.5.0-rc1

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

commit 31dda933e61c755bd84682f374f7ad31d5388974
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 22:19:55 +0800
Tag:    v2.4.4

Merge branch 'MDL-38315-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit fc282e4ab36f71efc92a99d4c63ec03ff04c5cd2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 22:06:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

commit da97cfe35ef7ef1d5e76338d227e6223f10b5725
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 21:57:19 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle

commit 9479d76a14e3274ec6d56dfb90a916da92b7f0c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 21:56:05 +0800
Tag:    v2.4.4

Merge branch 'MDL-38480_m24' of git://github.com/andreabix/moodle into MOODLE_24_STABLE

commit 373a40c5db86211706d715d14acd77308e339f43
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:38:24 +0800
Tag:    v2.5.0-rc1

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

commit 3b8841dda2a100f6a85b7a713e45f87d29ad36a8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:31:05 +0800
Tag:    v2.5.0-rc1

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

commit a20eeda845e3460039da866088d8dc3f02215c6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:17:13 +0800
Tag:    v2.4.4

Merge branch 'MDL-39445_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit ed8772d0f52ab0e26c81ad390d96178e3588dcf1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:17:00 +0800
Tag:    v2.3.7

Merge branch 'MDL-39445_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 4017ea2fce7a600ab433756f45b811de997a5c68
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 15:15:02 +0800
Tag:    v2.5.0-rc1

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

commit 9fbf1dfb6e1ec8850840f6b916b0b3571c04b4f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:27:19 +0800
Tag:    v2.5.0-rc1

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

commit 4c2a46e5078bf0a12fc9822e3f2c87333b7ec128
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:13:27 +0800
Tag:    v2.5.0-rc1

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

commit 80b9793b87f81d2e6a41a370794a2688eb0a30b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 12:00:34 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle

commit 516b8c9029db8577c720f05f11b8170e48b27f8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 May 2013 11:43:37 +0800
Tag:    v2.5.0-rc1

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

commit e1cd72ec72ac318ec55498643c1b90b8acc59622
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 03 May 2013 15:37:57 +0800
Tag:    v2.5.0-rc1

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

commit 6f0a4b8f242ff35d18f76e7f4507d4f97f7b349f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 16:22:48 +0800
Tag:    v2.3.7

Merge branch 'MDL-30775-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

commit ccd8763ce2782a73cbe5d9ff53b1c9c0a091bb29
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 16:21:55 +0800
Tag:    v2.4.4

Merge branch 'MDL-30775-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit e7c5ee5102767682efd3b83803f50b92334d89c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 16:20:30 +0800
Tag:    v2.5.0-rc1

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

commit b99122155c275719ca7cdb1dc46ba44994e7d373
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 14:50:49 +0800
Tag:    v2.5.0-rc1

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

commit 9c898f682a70c06616901c42adf253b59944b94f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 14:44:20 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges

commit f85fba3eebbed9937a58990e55bb58abcbd6e00c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 May 2013 13:54:59 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle

commit a6b274b232f85fc2a5f015360ea6775c9ec373bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 01 May 2013 10:04:50 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle

commit ff6479d21cbbc6ffc0aa975b27c386686db22746
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 16:27:04 +0800
Tag:    v2.3.7

Merge branch 'MDL-39354_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit a1ffe7e2352c13db0935d20638dff089bed5b96f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 16:25:08 +0800
Tag:    v2.4.4

Merge branch 'MDL-39354_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 89dc06570d9f55684bf81b62453190a987687892
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 16:24:07 +0800
Tag:    v2.5.0-rc1

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

commit 34e46d7556e8289440da0d4abfc1d87d8de560ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 15:51:12 +0800
Tag:    v2.5.0-rc1

Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle

commit 59d003497c75ad8a75b34516e49cb3dc4a825f5f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 14:13:25 +0800
Tag:    v2.5.0-rc1

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

commit a10c057b8e94b40546168c4b71a82ac702ea10a2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 14:06:42 +0800
Tag:    v2.5.0-rc1

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

commit 6476ff5a7c60d178948369b87cebb6310c8b7d50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:51:27 +0800
Tag:    v2.4.4

Merge branch 'MDL-37966_24' of git://github.com/jonof/moodle into MOODLE_24_STABLE

commit 767421c36c13552cadcaced08fcb657d76197682
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:26:47 +0800
Tag:    v2.5.0-rc1

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

commit 00f0d5c97fd7b145d05af895ee5270e7d2850b71
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:16:02 +0800
Tag:    v2.4.4

Merge branch 'MDL-39246_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 4969053f2522d6a27573ad8e6a7c6171057938d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 12:02:36 +0800
Tag:    v2.5.0-rc1

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

commit de079cffbf2cb3c3c760f5b64e6be3c7ef2f8ca5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 30 Apr 2013 11:39:24 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip_MDL_39230_2_5' of http://github.com/jamiepratt/moodle.git

commit 883e6a77cebb6738c7676a3877ba655e0b623534
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 16:05:08 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle

commit 5402f6462393e8708dd5f5ce9a0e6df8a4b5560e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 15:36:30 +0800
Tag:    v2.3.7

Merge branch 'MDL-39342_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 49b18efa4eda4971bf8142d685690909d9494270
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 15:36:09 +0800
Tag:    v2.4.4

Merge branch 'MDL-39342_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 9b77b2011d7845e4febc0e78cd1e9cfcf102a479
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 15:35:40 +0800
Tag:    v2.5.0-rc1

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

commit b38218cfb05a27da6fbba17f506fb71e38887457
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:52:40 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle

commit b7098909c10c6affdfe0a4333aa1eb244001c61b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:17:53 +0800
Tag:    v2.5.0-rc1

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

commit 6f9d4498d2c0737ac70a383228f5813d1b447d9a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:06:11 +0800
Tag:    v2.4.4

Merge branch 'MDL-30940-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 70f7ea93271a092aff50503ad74666e5f008afbc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:04:26 +0800
Tag:    v2.3.7

Merge branch 'MDL-30940-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit ea03f1149e359b33e8f857d0d3c3b11b6fad1716
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 14:03:34 +0800
Tag:    v2.5.0-rc1

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

commit bc5775b0ea35318104de3e0af9f8da6ced5bac9b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 13:00:19 +0800
Tag:    v2.5.0-rc1

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

commit c59a99df30f8c9172045646fdcecf37d4fe597ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 12:22:23 +0800
Tag:    v2.5.0-rc1

Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle

commit 018e8a9ad4259fb22b0c67ce9fb5817401d44da0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:47:02 +0800
Tag:    v2.3.7

Merge branch 'MDL-37845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 8927b51d23b830d352e89d56473c252b98132383
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:46:33 +0800
Tag:    v2.4.4

Merge branch 'MDL-37845_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit dd1ab4ae9acc25ecec9a96a214fcd1e5237dbc48
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:45:05 +0800
Tag:    v2.5.0-rc1

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

commit 58498bde5637b6fd99b838cd95f90025d53cfe38
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:10:35 +0800
Tag:    v2.4.4

Merge branch 'MDL-38440-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE

commit 50cc49ba042b142ef8b4758fa7075388e470f31c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 11:01:57 +0800
Tag:    v2.5.0-rc1

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

commit bd45c1aa4721d1253cb8bae8f537e3d8912911cb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 29 Apr 2013 10:45:55 +0800
Tag:    v2.5.0-rc1

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

commit 64bfea3b0e47fd0cbfe954fbdf25734374a97846
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 26 Apr 2013 11:55:30 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38833_settype' of git://github.com/andyjdavis/moodle

commit 44ed2fe740eb41332391719b571a478a45dcc088
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 26 Apr 2013 09:15:14 +0800
Tag:    v2.5.0-rc1

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

commit 11b6045b091ccc169ae525436417ac37c32fcb96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 16:10:30 +0800
Tag:    v2.5.0-rc1

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

commit 7d45396306a582a25b8bfcff7f5c6a3c8f801a83
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 15:01:35 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle

commit a6e22a88c7d0a75b0475a834d71d5d062234fd88
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 12:53:16 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39326-m25' of git://github.com/samhemelryk/moodle

commit c65bf472769b467baa6e8bd050c36d72407db361
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 24 Apr 2013 11:39:13 +0800
Tag:    v2.5.0-rc1

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

commit 9723842bc013aa55f4349d3f338299536720dd53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 12:02:47 +0800
Tag:    v2.4.4

Merge branch 'MDL-34933_24_STABLE' of https://github.com/mchurchward/moodle into MOODLE_24_STABLE

commit 3c719fafc5c9b58067638465067fe633ec9defde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 12:02:30 +0800
Tag:    v2.3.7

Merge branch 'MDL-34933_23_STABLE' of https://github.com/mchurchward/moodle into MOODLE_23_STABLE

commit b0c4e47499fb9eb2b72d2da860185016be6a119e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 09:20:05 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle

commit 3e8e66f454fecb0dd1ecb9bc920d940f6cefa0f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 23 Apr 2013 08:59:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39294-m25' of git://github.com/samhemelryk/moodle

commit f5e9aa843c78f5259046edbfc01e564652d64d31
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 15:11:59 +0800
Tag:    v2.5.0-rc1

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

commit 00ec4acc8fea86786639462471aacc7e4ddff0b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 14:00:11 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39182_master' of https://github.com/markn86/moodle

commit e9cd87eef2874b68078dfe2e07086dfc496d5cb5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 11:38:07 +0800
Tag:    v2.5.0-rc1

Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle

commit cf473c2189af764555af3661ec00361bad7d6224
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 10:31:30 +0800
Tag:    v2.3.7

Merge branch 'MDL-39050_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 499c16040d47f033de932df8a87cd9bbe9d3f558
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 10:29:20 +0800
Tag:    v2.4.4

Merge branch 'MDL-39050_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit b363d54ccdbf131b176b59259577c20ec889ec95
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 10:25:46 +0800
Tag:    v2.5.0-rc1

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

commit 80333fd96f6ba7df929871766fed0de92e5ea15c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 22 Apr 2013 09:52:09 +0800
Tag:    v2.5.0-rc1

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

commit 35490f63573d1759220f3cece3a091327be1384f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 15:49:16 +0800
Tag:    v2.5.0-rc1

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

commit 43d31248168f89ba1942b4f92414dd6576df432d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 15:15:10 +0800
Tag:    v2.5.0-rc1

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

commit 472ec72b2a8c3878ce8346f97710fd2dee2e1194
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 14:07:38 +0800
Tag:    v2.3.7

Merge branch 'MDL-39084-moodle23' of github.com:StudiUM/moodle into MOODLE_23_STABLE

commit 501dd08c6bebe57a40bb74ca053768471f79e392
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 14:07:15 +0800
Tag:    v2.4.4

Merge branch 'MDL-39084-moodle24' of github.com:StudiUM/moodle into MOODLE_24_STABLE

commit d9c22e944dddd68dbbfca3d022d118740b3cf761
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:58:15 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle

commit 747230d5649b2f17b9825f22cf7cd7ec34980e47
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:53:14 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle

commit 3054e59f405c737349de36ab09b069d642d18d7e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:30:54 +0800
Tag:    v2.4.4

Merge branch 'MDL-39167_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 8f6894b5f161d935a9398c99b2f80852eff826d5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:29:41 +0800
Tag:    v2.3.7

Merge branch 'MDL-39167_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit dd3b3a81d13f87f6c6589066abb5a5afcab02a5c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Apr 2013 13:13:28 +0800
Tag:    v2.5.0-rc1

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

commit d523d161feb9c201abb76e78e573d3f6eea28cde
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 16:56:09 +0800
Tag:    v2.5.0-rc1

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

commit 5073388e74434ebdedf3313f9f00cb83e477b661
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 16:03:33 +0800
Tag:    v2.5.0-rc1

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

commit 6a508eaccfece06dc232b48e1168b0c760faf325
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 15:56:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle

commit 35c4301b2c081364ec3148120e0c349130d63ee9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 15:14:19 +0800
Tag:    v2.3.7

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

commit 20d52c6b9c57f2b83342a0d2d6cdc46281d23168
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 14:42:20 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-38055-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit e0cded5d44f3453fb5e2ebd73bd15140ac3e48e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Apr 2013 14:32:53 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle

commit 5f022c57993b303d0b1c5191d33228bd24e00b65
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 14:24:52 +0800
Tag:    v2.5.0-rc1

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

commit f7f4494fb7863d9595dfc448bb5d46cc70a061c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 14:24:26 +0800
Tag:    v2.3.7

Merge branch 'MDL-39068_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 5ac9166740f9b23fdc994b6e4dba82467700e710
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 14:24:02 +0800
Tag:    v2.4.4

Merge branch 'MDL-39068_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit 23718dade9b9df193448f605f2fdbd0c5810120d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 13:30:28 +0800
Tag:    v2.5.0-rc1

Merge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle

commit 6bf520165bc9aeb9c96aa9213a5d9c95dbfe2288
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 12:37:54 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-37762-m24' of https://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 171c3d6c3cbae34b96b7184c5c9c25616f405897
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 11:57:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle

commit ca17a1242a03cd1945cc72d51db42c172607a2d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 11:01:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git

commit 6cf7afff3c0edf160ccf74e65c86850b58070fb8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 15 Apr 2013 08:56:27 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-39092-m' of git://github.com/andrewnicols/moodle

commit d3b880b578e56a599830665b85342bc91891fb8a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Apr 2013 11:37:48 +0800
Tag:    v2.3.7

Merge branch 'MDL-29877_bad_grade_item_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

commit d4a997b7d7a902c2df0565fa548c73f068e735ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Apr 2013 11:36:17 +0800
Tag:    v2.4.4

Merge branch 'MDL-29877_bad_grade_item_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

commit 77dd442ab94b4b261f8d9769cae79c56016cb8bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Apr 2013 11:14:10 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle

commit f8ddbd24d74e7f212a1510112f2acb954e112236
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 10 Apr 2013 11:17:31 +0800
Tag:    v2.5.0-rc1

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

commit 92674e324e7f2b9e1fda2a735e4a776b619afea1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 15:13:21 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle

commit e497e90c76803abeea17a7a7be749a704c05083d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 14:09:14 +0800
Tag:    v2.5.0-rc1

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

commit 9adb30759f93b3f95338929862fa58b881d770d3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 13:59:45 +0800
Tag:    v2.5.0-rc1

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

commit 67879710ee70f1ec53b24a305c9223bddc5f281f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 09 Apr 2013 13:20:52 +0800
Tag:    v2.5.0-rc1

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

commit 4fd1861c8fc3c2dbcaa4dcac36d67b3fa0f5be32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 15:42:36 +0800
Tag:    v2.5.0-rc1

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

commit 7d93a26aaefc2a44d09efb93706078e397a5aa32
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 14:09:19 +0800
Tag:    v2.2.10

Merge branch 'MDL-38452-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 2b705fc409f51b7a46cc0c93fb69a2c1beb1167c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 14:08:52 +0800
Tag:    v2.3.7

Merge branch 'MDL-38452-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 0ab296bd10eac28dace038e6dab76a2aa723e3c1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 14:08:24 +0800
Tag:    v2.4.4

Merge branch 'MDL-38452-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 278c280e8f0aede2494d46f48e04fd743f78d92b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 13:02:38 +0800
Tag:    v2.5.0-rc1

Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle

commit 5fbfc955d8400be784cc9a8f20d35e9bc5e35c9f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 12:32:56 +0800
Tag:    v2.5.0-rc1

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

commit a6c215ab1f90d72f7f8adeaafe76f44a8cc0b248
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 08 Apr 2013 12:00:52 +0800
Tag:    v2.5.0-rc1

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

commit eafa0ba46a376a1fe114d4cd19abc3e9cde26718
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 17:39:13 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle

commit 8806e79a14664b0032d9e4afa275d2c0394ea845
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 17:10:14 +0800
Tag:    v2.5.0-beta

Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle

commit 6aa38ef89a3790b05ac019129522c656907bf4c6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 05 Apr 2013 09:19:09 +0800
Tag:    v2.5.0-beta

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

commit 6ed18a6828de67fa317d647a51f11e4216a8a247
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 14:26:15 +0800
Tag:    v2.5.0-beta

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

commit 200571507ff3e841549b427ff5c0e74e43e0c674
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 11:22:20 +0800
Tag:    v2.5.0-beta

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

commit b38f932abf280efce478581267bac84248460dbb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 04 Apr 2013 10:34:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle

commit 82b175e86891f336c875f37f825f873fc42cb6cf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 15:48:35 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle

commit 9855770d6cebbf6e8bcaff32c47ce5b242d0318b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:48:06 +0800
Tag:    v2.5.0-beta

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

commit 6fb437b2bbd222c67a9cc6ce5d282b40ad772642
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:35:12 +0800
Tag:    v2.5.0-beta

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

commit 7bf602d9d30b53b9f0beb5142639794a4085b3ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 03 Apr 2013 14:32:11 +0800
Tag:    v2.5.0-beta

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

commit cc067484a8629e942b068f2225e5b32b7d2ddf0c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 16:17:25 +0800
Tag:    v2.5.0-beta

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

commit 5423f9a0afd04597846ef731152bfe642723ff53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 16:14:44 +0800
Tag:    v2.5.0-beta

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

commit 772e6ab1bfbceea7ab21c7a216aa0876814c2f06
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:24:19 +0800
Tag:    v2.3.7

Merge branch 'MDL-38713-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit bf6c1d0997a9d23d530a379b5f03401e01b6e7d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:23:00 +0800
Tag:    v2.5.0-beta

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

commit 0c61dbecf7cf78f64d989380c27356ac039b0173
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:19:51 +0800
Tag:    v2.4.4

Merge branch 'MDL-38713-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit f034c23b0a4d1ae2ab0a5adf9ddd132ab6df38d0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:11:13 +0800
Tag:    v2.4.4

Merge branch 'MDL-38700-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE

commit 2dc4d19f7906169455a84ed4deeabfeef5dd2a71
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 13:05:28 +0800
Tag:    v2.3.7

Merge branch 'MDL-38703-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit 9ab0aece4983254738ca925ddaf2fccc0b7d755c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 12:48:08 +0800
Tag:    v2.5.0-beta

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

commit 482823f2b618dd519cf78c4f766f10e0ea622fcf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 02 Apr 2013 12:31:52 +0800
Tag:    v2.3.7

Merge branch 'MDL-38700-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

commit f6d596dd5d743888386488763ad3a8bbbb2320bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 28 Mar 2013 10:42:18 +0800
Tag:    v2.3.7

Merge branch 'MDL-25631_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

commit 994bc95e2a954cf096908671cf55d876c8a07796
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 28 Mar 2013 10:41:20 +0800
Tag:    v2.4.4

Merge branch 'MDL-25631_m24' of git://github.com/merrill-oakland/moodle into MOODLE_24_STABLE

commit 86d66b5a1af2b201ddc33a1194e910d7e8c7aa44
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 28 Mar 2013 09:39:05 +0800
Tag:    v2.5.0-beta

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

commit 604a8ed4e519a2b402f5f5233e11a668cd56ae33
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 14:11:27 +0800
Tag:    v2.5.0-beta

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

commit ddeea94a35bd587fe0d855085bf342bb3ee14ffa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 12:17:47 +0800
Tag:    v2.5.0-beta

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

commit 1b393ce91de546b0082d416dfaf3159a6d6d060b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 11:57:14 +0800
Tag:    v2.5.0-beta

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

commit df9bdfb0004e6e331faf9968840f023f10ae6802
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Mar 2013 10:06:30 +0800
Tag:    v2.5.0-beta

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

commit 0231f91d864580efc75e3b33c7290a4c979d64f2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 16:11:47 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle

commit 48bf0941429a2b561019660ef0d98bef92deb237
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 16:02:28 +0800
Tag:    v2.4.4

Merge branch 'm24_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 3dbfd15872cd0063910e2ab073ec60e9473ce0c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 15:40:04 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle

commit 11ba99ea72d58c1f2d145e2480312d1a2e4d490b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 15:23:57 +0800
Tag:    v2.4.4

Merge branch 'm24_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle into MOODLE_24_STABLE

commit 2013daeb47b5e2632956d164adb2a4495bb712ef
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 15:13:35 +0800
Tag:    v2.5.0-beta

Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle

commit 96a927334311bbd0668d0fdc97d7358ea0b430fe
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:57:04 +0800
Tag:    v2.5.0-beta

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

commit 95764ab7efad24b67bc00bc53f4e7dd7109f908c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:49:34 +0800
Tag:    v2.5.0-beta

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

commit fe33e800778603ad7f740cc91bdbbcea4d2883ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:48:40 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-35875-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit 7e53f1a2310869402ae66e159453720709d3116a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:48:10 +0800
Tag:    v2.3.7

Merge branch 'wip-MDL-35875-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit c50107c847451a9ef1e558b26c1582054d7a74a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:38:06 +0800
Tag:    v2.3.7

Merge branch 'MDL-30438_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 06b3c7e96135ac5bb3357c37431f7e802a7b4e2c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:36:28 +0800
Tag:    v2.4.4

Merge branch 'MDL-30438_b_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit d0fd9726d1663ed8aefb413398adfec6507e8d76
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:29:57 +0800
Tag:    v2.5.0-beta

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

commit 0c241b980ad080cb2d154a3bec9e25627f549dc0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 14:22:11 +0800
Tag:    v2.5.0-beta

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

commit 8af0dffb5017fea25bf1401b290140711b306e51
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:46:29 +0800
Tag:    v2.5.0-beta

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

commit 37e50e931669ed9adf65a951bedf3e7ef6f14354
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:28:57 +0800
Tag:    v2.5.0-beta

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

commit 97707318c355045a823143df84159dabd940baa0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:25:16 +0800
Tag:    v2.3.7

Merge branch 'MDL-38380_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit a9cb8b73c88489fc103c019ad96b5490bb608b4e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:24:47 +0800
Tag:    v2.4.4

Merge branch 'MDL-38380_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 935ff91d5f1afe17f7cf4e4304ac924d06b1a074
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:23:53 +0800
Tag:    v2.5.0-beta

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

commit 553b23989a04065587a6b68a72554ba59f8f3312
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 13:12:29 +0800
Tag:    v2.5.0-beta

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

commit 1e425d185b68b6f77ff1e14d25c42197b1abdf47
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 12:59:53 +0800
Tag:    v2.5.0-beta

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

commit d21a452dcc21125601ee1d20acba6802e31e1e9b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 12:19:05 +0800
Tag:    v2.5.0-beta

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

commit 4523bbba8fa5372a5f5cb2becb4b2b6490aac12b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:43:32 +0800
Tag:    v2.3.7

Merge branch 'wip-mdl-36882-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 0e91ef2d66de83a97c1454791578d6992fcf8c00
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:42:18 +0800
Tag:    v2.4.4

Merge branch 'wip-mdl-36882-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 4e4ef99a15a64b12da9e72edc9f298c3323641c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:41:33 +0800
Tag:    v2.5.0-beta

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

commit 25e348d6aabeaa2b1e1cf8e041bb091527a4d41c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:15:08 +0800
Tag:    v2.3.7

Merge branch 'wip-mdl-36125-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit a5a3618c6646577e62abe7bdefaf8260de886492
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:13:38 +0800
Tag:    v2.4.4

Merge branch 'wip-mdl-36125-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE

commit 688f9a46b3638dfaf7c0c558b353cb50fb0c427e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 10:04:31 +0800
Tag:    v2.5.0-beta

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

commit febc08786edb3370f471cd46361bf4239a670326
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Mar 2013 09:38:46 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle

commit 0cdc5fc05989eb92a5999deb974608db806cadad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 16:00:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle

commit 8a95402f9439b66e47f4d5987acda10ae5705a9a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:51:56 +0800
Tag:    v2.3.7

Merge branch 'MDL-38668_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 33c1b04c2a4d8074326bed8abacfc770a6747790
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:51:29 +0800
Tag:    v2.4.4

Merge branch 'MDL-38668_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit 3b5539af5e8c0e44e53956af0e99c0d08a428a6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:51:01 +0800
Tag:    v2.5.0-beta

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

commit 8b18c1bae5209031bef62f09913cca492f9195d8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 15:36:25 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle

commit 35f155519e950d1c67a75c979fe51ca811d7f765
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 14:02:31 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle

commit 2e0b17051c98a4c8a2081ee4458d4e1a43a684c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 12:27:32 +0800
Tag:    v2.5.0-beta

Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle

commit e909c7c3907cdf2e4388031d5dc43a0923cf8689
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 11:30:36 +0800
Tag:    v2.5.0-beta

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

commit 716f35954eaee79c4f9c060d067bf5b4a2cd5b66
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 11:15:03 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle

commit adfcc976f6399be6ce2754bf35fa4e18494bb4ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 10:15:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle

commit 5320a265ab160c91ebba80f7f49aa1d29941a9f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 09:37:07 +0800
Tag:    v2.3.7

Merge branch 'MDL-37033_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 9fcdee8692d584ff9f420d67210a1547217156e1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 09:22:19 +0800
Tag:    v2.4.4

Merge branch 'MDL-37033_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit 3bdb3e1605a0feebe16e9051100c5dd86c92e656
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Mar 2013 09:13:50 +0800
Tag:    v2.5.0-beta

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

commit 4b5c4e26370dd0993808155c2b29e00885641b69
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Mar 2013 13:35:55 +0800
Tag:    v2.4.4

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 7c5fa92210b2505afad442f0436f81486ee4a347
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Mar 2013 13:35:42 +0800
Tag:    v2.3.7

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 7182a1613ed4af08842bfe7bb23a5535def6ff70
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Mar 2013 13:35:34 +0800
Tag:    v2.2.10

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 39b041eca17a285298649cf6b083f13243f86b96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Mar 2013 13:35:24 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit c2eb74df476db4c91d72230b109a6d865dea38df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 14:08:55 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle

commit 3ab41b977919aa580f77d4b19baeef8efa084809
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 13:46:59 +0800
Tag:    v2.4.4

Merge branch 'wip-MDL-38387-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit f50867c42487e403ab97b9c2cfd0aa3c46f5cfad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 13:24:18 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38387-m25' of https://github.com/samhemelryk/moodle

commit d3a9460d579d91c8e2eacbc07f52c03fda8f0515
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 12:40:01 +0800
Tag:    v2.3.7

Merge branch 'MDL-38373_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

commit 81c8a28c72c132f1117255ee222abf746baf275b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 12:34:26 +0800
Tag:    v2.4.4

Merge branch 'MDL-38373_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE

commit 80d852fa23a80ff9b068f654a26f227076785c1f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Mar 2013 11:05:38 +0800
Tag:    v2.5.0-beta

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

commit 43087d02dd624c3e3f20e5541e06bbf64775890a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 16:17:41 +0800
Tag:    v2.5.0-beta

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

commit 0cabeada654251a82f8eb006ea87516d96c40369
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:47:35 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle

commit db98fa786ea62c2f5b4a6a32d862f9565e573d74
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:18:13 +0800
Tag:    v2.5.0-beta

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

commit f402d3225fd3a969f39e317aa50bb24b32f9b034
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:02:23 +0800
Tag:    v2.4.4

Merge branch 'w12_MDL-38320_m24_logininfo' of git://github.com/skodak/moodle into MOODLE_24_STABLE

commit 851c304f45ad7e52ae27e17576c0e2b8f09057b4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 15:01:02 +0800
Tag:    v2.5.0-beta

Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle

commit 976b0ff2d4ff3bf5d44d3cd24ec6b0b53b1a3f73
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:54:40 +0800
Tag:    v2.5.0-beta

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

commit 08f5b90bb7c4ce655fb8a7948a0769dfd9db51b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:36:43 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle

commit 0cb081f51fd5725ef245551156bf49c011afc4a9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:12:23 +0800
Tag:    v2.4.4

Merge branch 'MDL-38456-mdeploy-paths_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit a34ffe2e2ecc8801df63f44bed547f16ec609117
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 14:02:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38456-mdeploy-paths' of git://github.com/mudrd8mz/moodle

commit 716db45f50e28f44f51895846cc70f8cca574fe9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 12:15:48 +0800
Tag:    v2.5.0-beta

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

commit dcc5f0fe1e32c44d1926a5e37608c0b8ba9c121e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 11:52:51 +0800
Tag:    v2.5.0-beta

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

commit 8fe55f6862d5033b9e1fb6b6c2215b993024035c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 11:13:23 +0800
Tag:    v2.5.0-beta

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

commit 23477802b7adbd4216aa14c3239e32b80034d415
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Mar 2013 09:31:07 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle

commit f0c3a5ed669aa7f72cfa621d6da41064d1bcb601
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 15:57:02 +0800
Tag:    v2.2.10

Merge branch 'm22_MDL-38450' of git://github.com/totara/moodle into MOODLE_22_STABLE

commit 7c211f565a272d64465a23b2087ae7940cde43e2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:45:41 +0800
Tag:    v2.5.0-beta

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

commit 9ccc1e1f34c94bc7a19853a49b8dd541e2c1c0ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:24:45 +0800
Tag:    v2.5.0-beta

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

commit 61e871c3c977d3afbbe45ed8936760a90c7c593b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 13:08:41 +0800
Tag:    v2.5.0-beta

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

commit b100f948cb2b74866fd5e2facae9f2166be27a0f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 11:46:15 +0800
Tag:    v2.3.7

Merge branch 'MDL-38215-workshop-oracle_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 147400d8467fa72d9a536fbada1c2de3b9b5bd50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 11:45:53 +0800
Tag:    v2.4.4

Merge branch 'MDL-38215-workshop-oracle_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 1ef6160aded8babccd796a187965dff4624ca313
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Mar 2013 11:41:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38215-workshop-oracle' of git://github.com/mudrd8mz/moodle

commit 71127292069e98bc6ba36026b2ac1b3250bbf21c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 13:49:57 +0800
Tag:    v2.5.0-beta

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

commit cd824e74d8545578f06bca7eed5ddc78c7fac0dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 13:06:04 +0800
Tag:    v2.4.3

Merge branch 'MDL-38474-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 6e4274111690f9eaac968dbbda2cec8cd698ceb5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 13:04:33 +0800
Tag:    v2.3.6

Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 395f9fe90d21772097f6b8b09e0d7533b6c298d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 11:11:31 +0800
Tag:    v2.2.9

Merge branch 'MDL-38474-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 1f84f2e54af746e75dea4f81c5065479c8c2ea39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 10:56:18 +0800
Tag:    v2.3.6

Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 54c0c9e58eb6f69ff3b8d4d9a6ab9053220ce2e1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 10:50:47 +0800
Tag:    v2.4.3

Merge branch 'MDL-38474-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit 6a284704fea9a2ae7e76772a519020c3468a7991
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 10:43:46 +0800
Tag:    v2.5.0-beta

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

commit ea8393591f6e9730d31a184210b2ffc161db5636
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Mar 2013 15:32:34 +0800
Tag:    v2.4.3

Merge branch 'wip-MDL-38303-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 3f5ef33fb9080f1bb6ee779634e83a8b08504520
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Mar 2013 15:30:32 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38303-m25' of git://github.com/samhemelryk/moodle

commit b37e555f6d3e9d068427cfd5b0020a1d4c0a6ef6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Mar 2013 16:12:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38184_master-winfix' of git://github.com/dmonllao/moodle

commit 61cd50618a5ff227f5a52006f94c5b2310a73abf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:35:19 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38184_master' of git://github.com/dmonllao/moodle

commit 3de89ef8eabd196d21281c887e0a0c773647cbda
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:11:38 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38346_master-fix' of git://github.com/dmonllao/moodle

commit c6f24157578b17680ddd71158017a8d7139fe61f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:05:42 +0800
Tag:    v2.3.6

Merge branch 'MDL-34011_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

commit 2b2d3244cd96d4f3e0a90590b892f6d1a8190b87
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:04:54 +0800
Tag:    v2.4.3

Merge branch 'MDL-34011_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

commit 43c791653b9d23e0404e1bb0c07a272c5b9c949f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:03:53 +0800
Tag:    v2.5.0-beta

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

commit f196cfe83af99b2bd02818238f4265db6ede0503
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 13:51:40 +0800
Tag:    v2.5.0-beta

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

commit b3f8740157dcc440b3c6d77bf07be1bc888bbce4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 11:23:48 +0800
Tag:    v2.3.6

Merge branch 'MDL-37771-M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit a22f7cb864e8b4cd8e2bacc9ae679aedb5e9f118
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 11:22:16 +0800
Tag:    v2.4.3

Merge branch 'MDL-37771-M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit 95045941e6cf1270bd101700664a3c758e89c44c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 16:19:53 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38389-m' of git://github.com/andrewnicols/moodle

commit 97846ce94c7f3bb74c63f83818c8311daea264ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:48:18 +0800
Tag:    v2.3.6

Merge branch 'wip-MDL-34713-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

commit ff28c81cb6d93e001c036e5e82a20a1448e3f786
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:47:22 +0800
Tag:    v2.4.3

Merge branch 'wip-MDL-34713-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE

commit fcdb8cec4eadbe5d42b60d5d9c730817096b2ae6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:43:56 +0800
Tag:    v2.5.0-beta

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

commit e18c12c190cd4c8b89416ef841225a27478a75a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:30:45 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-33424' of git://github.com/jmvedrine/moodle

commit 494c554bf32ff6df8299fb4c184c55ad6f9bb545
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:18:04 +0800
Tag:    v2.4.3

Merge branch 'MDL-33424_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE

commit 18329cbf1ec225a979cabca13735df241c225700
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 16:14:55 +0800
Tag:    v2.3.5

Merge branch 'MDL-38282_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit fa1a43c43eac3e0acc53ef578ae13536e76a6a6c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 16:14:26 +0800
Tag:    v2.4.2

Merge branch 'MDL-38282_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit ce91af8114aa534e251a6d98aaa9aa36b97c6295
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 16:06:31 +0800
Tag:    v2.5.0-beta

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

commit 0622ef3aa582331655e00ca0ba13c66ff1c9db3c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:37:13 +0800
Tag:    v2.3.5

Merge branch 'MDL-38279_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 099b7986a509e889ccf065f9d91906d3356e4866
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:36:15 +0800
Tag:    v2.4.2

Merge branch 'MDL-38279_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

commit 915b7aca62b2867dbc93069a483fe9a7af9e6136
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:22:38 +0800
Tag:    v2.5.0-beta

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

commit d0eac6f6393f24e0a776b024ddb29757a7bed023
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 15:10:52 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle

commit ffb95d5fdc2f23e4a0446b634e8dcc3a0c60dcc7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 14:13:42 +0800
Tag:    v2.5.0-beta

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

commit 6fbf382cd4a470a374b07285fd333eca547b2c85
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 14:10:00 +0800
Tag:    v2.5.0-beta

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

commit be98769eabc8510f9b6f8f7a4493226a2ee1f3f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 13:12:12 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37903-m25' of git://github.com/samhemelryk/moodle

commit c23f9efc64e53603aa29a142890feeb568d42d61
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 13:07:19 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37935-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit 6be6b2b0738c111b447a13819ad0c199631d0833
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 13:05:57 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle

commit a27996bbad902e3adbbdefb3f1d271323b879f5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 11:42:25 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle

commit 469025580f16d6ab6f507b9b7a9787169b22e50a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 11:41:11 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38055-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit db66ab78985a9eb1c01167ed9504612073ff20a5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Mar 2013 11:40:02 +0800
Tag:    v2.3.5

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

commit 507507352b8f3bab89e776166a5f3c621a0c43b3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Feb 2013 09:58:24 +0800
Tag:    v2.4.2

Merge branch 'MDL-35127_m24' of git://github.com/merrill-oakland/moodle into MDL-35127-24

commit a6c54ab297dc66a45b099e44f8ec742c33557b64
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 27 Feb 2013 09:49:55 +0800
Tag:    v2.3.5

Merge branch 'MDL-35127_m23' of git://github.com/merrill-oakland/moodle into MDL-35127-23

commit db0c7b4e7ba76470c8fff975188c0ab78321aa24
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Feb 2013 10:54:48 +0800
Tag:    v2.4.2

Merge branch 'MDL-37792-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

commit b672408a1af9fd2361ef4b0e1c8e9a8bc993dff3
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 26 Feb 2013 10:45:21 +0800
Tag:    v2.5.0-beta

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

commit a3e57810c6537db1612b69afc1fdcbe5681bebd2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:49:13 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle

commit fffb9bbe6405cb951ecf5867988ebd134447810d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:42:13 +0800
Tag:    v2.5.0-beta

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

commit 61725199a9a805f3a36c781e26d5c5ff97051034
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 15:23:19 +0800
Tag:    v2.5.0-beta

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

commit 44c3f54c921545fb9ad5fa5ed7b6b03505a00bda
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 14:09:33 +0800
Tag:    v2.5.0-beta

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

commit 24773be4032626b8c901afe052fa74c686a3c786
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 13:36:31 +0800
Tag:    v2.3.5

Merge branch 'MDL-28692_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 6ff9929833d073b48af6025498be0af61ca5259b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 13:34:55 +0800
Tag:    v2.4.2

Merge branch 'MDL-28692_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE

commit c7cb130bce2f9b2b9ca14e4cf221169cf7f98e2f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 13:32:25 +0800
Tag:    v2.5.0-beta

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

commit cc7a1c891659ee81819ebfd31eac240a3928e12a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 12:37:56 +0800
Tag:    v2.5.0-beta

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

commit 23f7fed1e1d3f560bf4088c97cfd56545b162d5b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 12:10:06 +0800
Tag:    v2.5.0-beta

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

commit 203338ab023dd58ba5ce9fa870c2c60baef82808
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 11:38:47 +0800
Tag:    v2.4.2

Merge branch 'MDL-38052_M24' of git://github.com/kordan/moodle into MOODLE_24_STABLE

commit b625f85949cd7c2e792802fb656db848f97db8d7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 11:38:13 +0800
Tag:    v2.5.0-beta

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

commit dbfe8e26eeec8f3d2188491221766bda6927891c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 10:50:38 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle

commit 89fcdca1193636cff16419b2f07384323df4926a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 10:44:54 +0800
Tag:    v2.5.0-beta

Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle

commit b53e905618e1bfe692192f0452eb85771782ee02
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 09:53:46 +0800
Tag:    v2.3.5

Merge branch 'MDL-35175_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

commit a083389c63e395f6d5c51e4b064ecab03367886f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 25 Feb 2013 09:52:19 +0800
Tag:    v2.4.2

Merge branch 'MDL-35175_24' of git://github.com/rlorenzo/moodle into MOODLE_24_STABLE

commit 45dc254910a8fce1ee68e15276ffcce4f9a81d49
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Feb 2013 10:50:27 +0800
Tag:    v2.4.2

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit b2c16779d2fd0fd5f7242198fd525c5c104a90dc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 22 Feb 2013 10:50:07 +0800
Tag:    v2.3.5

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit cfd2addf3fc91ee438cb953225af7365cc576e82
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 20 Feb 2013 08:54:57 +0800
Tag:    v2.5.0-beta

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

commit 1ec8da670689e135d5cef360f6d5ccaf8344392a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 13:48:12 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle

commit fc511c8e482a8c7569135d57e471dc327d801465
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 13:47:23 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-38000-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit b27fc5b64f00d868430cf60c87339bfafdd967e0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 12:36:40 +0800
Tag:    v2.5.0-beta

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

commit ebb1385c39997ea301206ed8e703232d8f13cd70
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Feb 2013 10:10:48 +0800
Tag:    v2.5.0-beta

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

commit 74f3d44d37341b3125301903c47d86538ce03b4a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 14:51:50 +0800
Tag:    v2.5.0-beta

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

commit 82a6332837b57fa67e6aad30cb6ca053330fe201
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 13:35:36 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle

commit bf78144a45f9eb0971081c3730a67807b9292c44
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 13:31:40 +0800
Tag:    v2.3.5

Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23_STABLE

commit bc11a70203cd7f16b81faa138d7dd485043a97ad
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 12:47:32 +0800
Tag:    v2.4.2

Merge branch 'MDL-37939-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE

commit b6f49c741d85c1715dc36187927cc8b68b4565c9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 10:39:47 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37683-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit cd747874a422257f9e113d620ad658c2964c4a24
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Feb 2013 09:30:47 +0800
Tag:    v2.5.0-beta

Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle

commit 73e15efa4b2eea036d8ea6b17d6da2225ddb7b7e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Feb 2013 14:06:54 +0800
Tag:    v2.4.2

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 212fa54826c832761826952854bd896ad27e7d10
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Feb 2013 14:04:18 +0800
Tag:    v2.3.5

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 955980b2383284d0018a9654032db57fa97e8713
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Feb 2013 14:00:53 +0800
Tag:    v2.2.8

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 082685e2de632afff57bf3b3013870060873e422
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 14 Feb 2013 13:37:48 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit 6e591593871afa555d4fe36d532fcab4860ad535
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Feb 2013 15:04:51 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle

commit 147f5927425dce6ceb2b665e1bdc3bcb0b7b22a4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:48:40 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle

commit f49ec4297310f295af1999eb58d3f5dee1da168e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:47:50 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle

commit 2262c52122211cb402be52512817f495de78401c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:39:20 +0800
Tag:    v2.5.0-beta

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

commit 5926f85960e68e84399702f40ca873a9500a9ff5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 14:15:29 +0800
Tag:    v2.5.0-beta

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

commit 69046889674be668bb0ae963d43c8017022da511
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 13:09:18 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle

commit 7339d6c0e94704b53c913b0e1250d8188c73a2d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 12:12:44 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle

commit dad4fa26e71018e96dbc22d697ff255bba9e11c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 11:40:40 +0800
Tag:    v2.5.0-beta

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

commit 234fdc206c10184650649c513b973a7b244dd270
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 10:09:26 +0800
Tag:    v2.5.0-beta

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

commit 82708d06158e397242a9393fc599849872bec02b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Feb 2013 09:15:23 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle

commit 1e7db9fee8061da051339f44e61acb087f5ab859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Feb 2013 14:51:11 +0800
Tag:    v2.5.0-beta

Merge branch 'master_MDL-35332' of git://github.com/totara/moodle

commit 40f1c065b4ba90b330794e71a8373a9155a00d57
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Feb 2013 10:37:03 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle

commit eb28bb604f113d26fc5eb3e62ff6b20b60cff777
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Feb 2013 11:02:42 +0800
Tag:    v2.5.0-beta

Merge branch 'install_master' of git://git.moodle.cz/moodle-install

commit f2d81d1e545dd62f6219bde7919a5e5661b1dc43
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Feb 2013 11:01:44 +0800
Tag:    v2.4.2

Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE

commit 6337a605210792fd200811abe0d09fbea355d34b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Feb 2013 10:59:37 +0800
Tag:    v2.3.5

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit 33d943500fe5cfdc132c0d3c5f5fd5a3b483e267
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 15:53:21 +0800
Tag:    v2.5.0-beta

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

commit 9d6f6a698797a8fdf042f0a6599d94d13a31099e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 14:11:07 +0800
Tag:    v2.5.0-beta

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

commit 174d85723509e8e048b5a557b35f026897c761b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 11:49:16 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37626-m' of git://github.com/andrewnicols/moodle

commit 183e656eeaeb2b7c2f17b5c234671650cf5b6559
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Feb 2013 11:23:01 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle

commit e20455a5ae9bc594ead43dffe1934bea4d5747b8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 16:19:51 +0800
Tag:    v2.3.5

Merge branch 'MDL-37781-workshop-schedule_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

commit 2c9f35960f836f5e8b1f3794301ef2b43b310d9e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 16:19:26 +0800
Tag:    v2.4.2

Merge branch 'MDL-37781-workshop-schedule_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE

commit 935ec5e77e29394feed4d55a5d0fa0a0751f7618
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 16:18:00 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle

commit c15cda6138926dec48a8cb325792af8dcfa4f910
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 12:48:42 +0800
Tag:    v2.5.0-beta

Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle

commit ecd60630aca0026ec4abdf3ca97076ea076c157e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:41:33 +0800
Tag:    v2.4.2

Merge branch 'm24_MDL-36800' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

commit c04dac34738d8fccbbae98e667b0a13a387d32d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:35:54 +0800
Tag:    v2.5.0-beta

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

commit 8917ec51171b11563a246ceca170c8ee3790f8f1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:18:33 +0800
Tag:    v2.4.2

Merge branch 'MDL-37177-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

commit ef23b6ff4f66cd70962b342a80514ad573d97148
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Feb 2013 11:12:45 +0800
Tag:    v2.5.0-beta

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

commit 2c24a252c5f5bcbe51cab79c7e1222cb4788a0b5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Jan 2013 09:06:04 +0800
Tag:    v2.4.2

Merge branch 'wip-MDL-37747-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

commit fd637d38ac8195feb22f0f4a3022f3d99dbd918f
Author: Damyon Wiese <damyon.wiese@netspot.com.au>
Date:   Thu, 13 Sep 2012 10:02:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration