Git merges in Moodle 2.5.2 by Marina Glancy

commit 71699c5a8104100c0e667af82a4fad1f3064d388
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 06 Aug 2013 12:39:26 +0800
Tag:    v2.5.2

Merge branch 'MDL-31226-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 0b1723fd577ec2310cc5754a9ceaa007904833e9
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 15:16:47 +0800
Tag:    v2.5.2

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

commit 25dcfa6f5400a3b17139a746239be43535bd724c
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:52:38 +0800
Tag:    v2.5.2

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

commit a4bd80565f42bc61dc6d9f580183473ba1c5e2b3
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 11:16:34 +0800
Tag:    v2.5.2

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

commit 153cb0b4c326cb0e125beb6a9e4787d1127d7082
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:31:53 +0800
Tag:    v2.5.2

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

commit 2adfb6528edaeb1db44e2bc2e212f4b9ab2bfbcd
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 10:20:40 +0800
Tag:    v2.5.2

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

commit e8a943e3610724214e40e511b268a1b11e6bec42
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 05 Aug 2013 08:49:32 +0800
Tag:    v2.5.2

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

commit d11977ebc91ba3fd7cb4bf75f72a85af03e5eea6
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 17 Jul 2013 10:46:26 +0800
Tag:    v2.5.2

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

commit 996d7754571dce7937ed5d492c9350312890f77f
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 14:11:29 +0800
Tag:    v2.5.2

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

commit da4a51d096ff27f965f75c924af9d372fe393319
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 16 Jul 2013 12:33:24 +0800
Tag:    v2.5.2

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

commit 2500fc57d0b1d037225183385dc9e22b652bf206
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 12:44:22 +0800
Tag:    v2.5.2

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

commit eccf42d9d987e97fa3cd191ede59d0b4f31d8dec
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 15 Jul 2013 10:42:57 +0800
Tag:    v2.5.2

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

commit 63c8f25b1bea72379ec4c4a311f09c629fd4a7b0
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 14:25:38 +0800
Tag:    v2.5.2

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

commit 0f2a0a3fb0c3cff4edbd3a8f759683a782df8a95
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 10:01:29 +0800
Tag:    v2.5.2

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

commit 4d8ff7c8e27301a366954ba2fa271e45ad7f673b
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 09:09:44 +0800
Tag:    v2.5.2

Merge branch 'w28_MDL-40488_m25_admin' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 512ab8e262ea094d88f21dad73c6b6fde375530c
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 10 Jul 2013 08:02:53 +0800
Tag:    v2.5.2

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

commit 1b0951a26a24b7e872c17bb3b87f01952527f1a6
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 19:36:12 +0800
Tag:    v2.5.2

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

commit 82043201ea9434a48177194dbe0b9b5e4d1e6fdd
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 14:34:28 +0800
Tag:    v2.5.2

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

commit 33025649f3292e14e99f32f71bc754fb7739b53e
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 09 Jul 2013 09:31:52 +0800
Tag:    v2.5.2

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