Git merges in Moodle 2.5.1 by Dan Poltawski

commit dee6316364013182b357925bafe7fc52034be27c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:53:06 +0800
Tag:    v2.5.1

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

commit f6b1260812bcf93e38a6cddddfd7565d37d08715
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 15:15:32 +0800
Tag:    v2.5.1

Merge branch 'MDL-40282.25' of github.com:colchambers/moodle into MOODLE_25_STABLE

commit a852df6f11d1f88e4820838ff23e81c083263fc8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:43:45 +0800
Tag:    v2.5.1

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

commit d7e626156e3ebadba71f493ae379ff936bbfaad0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 13:33:59 +0800
Tag:    v2.5.1

Merge branch 'w27_MDL-40399_m25_msarrayshift' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 204383e50d310785d3601106c63ffb2dc7d675e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Jul 2013 09:55:24 +0800
Tag:    v2.5.1

Merge branch 'w27_MDL-40266_m25_arrayshift' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7698803c95838977e6defb033db5593ba94b6613
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Jul 2013 11:22:05 +0800
Tag:    v2.5.1

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

commit 8e29fe2d72a095ef3a38d1e6fcdee622149c9fc3
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 21 Jun 2013 13:29:46 +0800
Tag:    v2.5.1

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

commit 160e432aee9cb09c076379d486d90bc214f78cb9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 16:41:15 +0800
Tag:    v2.5.1

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

commit e38c37939a556a5f6091121ddf31ef2f7de74a9d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Jun 2013 13:37:23 +0800
Tag:    v2.5.1

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

commit 6117c578e4c534de6316ff769a165270ab4c6827
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Jun 2013 09:34:04 +0800
Tag:    v2.5.1

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

commit bacf4c5c713e69bbe8c7c844859dc75eddb0f8f5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 16:00:51 +0800
Tag:    v2.5.1

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

commit 43c5a7d5ad9b8b5803646b339eea1cf7aeee2f14
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 15:35:31 +0800
Tag:    v2.5.1

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

commit f60ad3fdff91f152447c8dfc19ff030eadd85e50
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Jun 2013 12:54:38 +0800
Tag:    v2.5.1

Merge branch 'm25_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 96241e57e9fb5f50471e5b5d77dcf8f7abe2ecd1
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:20:30 +0800
Tag:    v2.5.1

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

commit ade2afc29faa9c417cc233672262334a0eb2af58
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 16:07:28 +0800
Tag:    v2.5.1

Merge branch 'MDL-39338_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 534f1476f409a07ce2c4ccebeadd5d29393156e7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:42:53 +0800
Tag:    v2.5.1

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

commit a327e8786658f9dde6f16df56a36bcd94eff2b3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 15:00:20 +0800
Tag:    v2.5.1

Merge branch 'MDL-40018_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 0f74c82897e29ea1c0637e36f50a94d7c5fc31ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 14:58:12 +0800
Tag:    v2.5.1

Merge branch 'MDL-40013_25stable' of git://github.com/oasychev/moodle into MOODLE_25_STABLE

commit 7f9f03442a2ace327340a058f456752246be9e66
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 13:12:16 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-39096_m25_obfuscate' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9d1a909f0ece996502879b4162765efde168afe8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:17:04 +0800
Tag:    v2.5.1

Merge branch 'w24_MDL-28394_m25_enrolrestore' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit c9d1c4993db8f40aaf29f0ec78fb90b8c9c311c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 12:09:59 +0800
Tag:    v2.5.1

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

commit 6f4232974ed56fec5b6ecb7e7140c4c598d6d133
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Jun 2013 10:54:27 +0800
Tag:    v2.5.1

Merge branch 'wip-MDL-39824-m25' of http://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit 1c437c97f77ef76708195655ec62673e06fd3ab6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 06 Jun 2013 11:55:07 +0800
Tag:    v2.5.1

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

commit e0e6015416487391c8ac3c4d4e8aaff6662ec3ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Jun 2013 13:10:18 +0800
Tag:    v2.5.1

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

commit bf2360c59733025daab84ad762494160ec4d27fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 15:54:01 +0800
Tag:    v2.5.1

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

commit e7bb4b1ee79931be70c1dcee6646ceff0a223956
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:43:13 +0800
Tag:    v2.5.1

Merge branch 'MDL-39835_M25' of github.com:lazydaisy/moodle into MOODLE_25_STABLE

commit 2b7e18fdedae14a01ef6ba89af40af4a6d3558c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 14:38:36 +0800
Tag:    v2.5.1

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

commit 2fdfdd49d442b8f8e59c1eefbc52afa2cc48a82d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:32:33 +0800
Tag:    v2.5.1

Merge branch 'MDL-39931-M25' of github.com:lazydaisy/moodle into MOODLE_25_STABLE

commit cb1318754e034f7a00b1a81f6e1f91e9f2a7bedb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 13:19:16 +0800
Tag:    v2.5.1

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

commit 2140e5afa40219bb8dc23edf3cf57db7a5c1d4d5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:29:57 +0800
Tag:    v2.5.1

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

commit acae4313c8e0bdcc10e04279b23f10af4eff3c8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:26:33 +0800
Tag:    v2.5.1

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

commit e19a07bfcb807ea7e64a6f064b5809134e1f3111
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 11:03:45 +0800
Tag:    v2.5.1

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

commit c687e8d741b18a9ed5bcc36aa5b0b68ce64a2805
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Jun 2013 10:42:55 +0800
Tag:    v2.5.1

Merge branch 'wip_25_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_25_STABLE

commit 8d94299b02264f4a1d209cdcea33103ef9b9ca4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:36:55 +0800
Tag:    v2.5.1

Merge branch 'MDL-39806_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 121e2492e80046102ed68ebc884cd5e5e4bf12ef
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 14:13:36 +0800
Tag:    v2.5.1

Merge branch 'MDL-38239-moodle25' of git://github.com/StudiUM/moodle into MOODLE_25_STABLE

commit 6c16494f030a35a929de634e910f3fa85955be43
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:43:37 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-39688_m25_etag' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 191e70c2e2b71830030d3695318b4d5dc71620d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 13:05:14 +0800
Tag:    v2.5.1

Merge branch 'w22_MDL-38408_m25_paypalcost' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ceb4030763257d4eb323cd1b6d899ee319e15515
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:18:32 +0800
Tag:    v2.5.1

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

commit b051261ecc39e09cfc47d4afec0314f791522ca7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 May 2013 11:00:32 +0800
Tag:    v2.5.1

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

commit e90eb091c519fc37da8c5337e47c080fc5468c33
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 May 2013 17:58:29 +0800
Tag:    v2.5.1

Merge branch 'w18_MDL-39374_m25_folderlog' of git://github.com/skodak/moodle into MOODLE_25_STABLE