Git merges in Moodle 2.5.1 by Eloy Lafuente (stronk7)

commit 1a5986dab9ffc3e3d17539d47e9bcc4d2dab70c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jul 2013 03:12:10 +0800
Tag:    v2.5.1

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

commit a9155c2875adeada1bc4680bcb89f8d1d00facf1
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 20:27:24 +0800
Tag:    v2.5.1

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

commit 4d52fbbc143eb03851c1fe121eb1446a53851156
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 19:47:37 +0800
Tag:    v2.5.1

Merge branch 'MDL-40439-en_fix_25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit f1293083a2f4f6970baa6a4221b5d9844b303877
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 06:46:38 +0800
Tag:    v2.5.1

Merge branch 'get_users_by_capability_fix_m25' of http://github.com/timgus/moodle into MOODLE_25_STABLE

commit 2bc8f2160018810e57bc3e4f758ed7576d8eb08a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:05 +0800
Tag:    v2.5.1

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

commit 75b8d4a1465e2f1178ffdc9a824ec0e573ab5a1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 00:02:32 +0800
Tag:    v2.5.1

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

commit 97a7b6a7aa985b2ec77fc944837f970cf3f7fe48
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 28 Jun 2013 02:05:10 +0800
Tag:    v2.5.1

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

commit 866ab6e1ce0834062b2a2b6f86b2ce08e4001fb3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Jun 2013 18:30:51 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 3166c21471751e5d7eb4ead30f12f4ad931d6f40
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 18:08:25 +0800
Tag:    v2.5.1

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

commit e9d80e664b9f1c0e629e57eed4237a9d0bc9ae79
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:29:13 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40233_m25_frontset' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ffc480afbd60d4851cbeff1f69da8db5d3f7a0ab
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:23:43 +0800
Tag:    v2.5.1

Merge branch 'MDL-40264-m25-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_25_STABLE

commit 3d4a0f28875a3094c1e032fcd9c820c6bb677da0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 03:13:06 +0800
Tag:    v2.5.1

Merge branch 'w26_MDL-40254_m25_flatfile' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 9067595bf315d3b7887ba890817d73d2ead0cdb8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 02:21:30 +0800
Tag:    v2.5.1

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

commit 94a541f7ff8fcc38548a9d2b3c54e24745f4362b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:26:22 +0800
Tag:    v2.5.1

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

commit 3e6f11b240b3e607edfae40aec50863bc533483b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 25 Jun 2013 01:00:43 +0800
Tag:    v2.5.1

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

commit 5e069cbd969540ce5c1100f515c1a9d657b5dc58
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 07:45:27 +0800
Tag:    v2.5.1

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

commit 5cc26839e79d05735371e952a0cb3d1365195242
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:56:11 +0800
Tag:    v2.5.1

Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit a831f154aed9764d50d2273360a99a12587f9ca6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 18 Jun 2013 06:44:17 +0800
Tag:    v2.5.1

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

commit 61899ac202f9dbbe07d198385c5321b54b122b08
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Jun 2013 01:32:14 +0800
Tag:    v2.5.1

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

commit 92c46e00eb10fa0ec0c5b5c61aee98bac60716a2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:24:22 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 1127607bce385db74de59487fb24668dbbe800ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 22:18:01 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39503_m25_signup' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit ef580461f69a77b356151f9eb25e0ef40449bf30
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 16:36:22 +0800
Tag:    v2.5.1

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

commit ea85ee6f63410042cab5cbe62e0cabf76a593d64
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:43:48 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39416_m25_pagelog' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 832aa7eb718b08bcdd56fc2f9f5175edc59455c8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:30:56 +0800
Tag:    v2.5.1

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

commit 0e73df9df61e7d3c2a43598d5ef0770af0279207
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 08:27:35 +0800
Tag:    v2.5.1

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

commit ef8a1c4908995aa9b224f7efd52c817db4b1acf8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:45:28 +0800
Tag:    v2.5.1

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

commit 0f51a82bae7faab933612d14983583dff64c7b1c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Jun 2013 07:43:11 +0800
Tag:    v2.5.1

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

commit 8c8b3eba2479e99a69a07ca77487d5954584dd49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 23:48:57 +0800
Tag:    v2.5.1

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

commit 1fe7be205c5b3e9f0aa3bc7216cbc4988a5936c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:58:27 +0800
Tag:    v2.5.1

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

commit 8a2cee5091bc5f3874ae436baa1b8e08b0dfc2a7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:43:28 +0800
Tag:    v2.5.1

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

commit ca7f399be73d5f2170272711d227680de6d5ce87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 07:32:12 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39882_m25_behatconfig' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 618737d7e9e532596a00825d38fb4352d69e1cc4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:05:04 +0800
Tag:    v2.5.1

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

commit 06ab9b88886cfb8671bb3460046b1b5ae71ca97b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 06:00:44 +0800
Tag:    v2.5.1

Merge branch 'w23_MDL-39465_m25_environment' of git://github.com/skodak/moodle into MOODLE_25_STABLE

commit 73f8ab649f9f8a5d90e23c17464e7427116aea24
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 05:22:17 +0800
Tag:    v2.5.1

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

commit 189590bb37854c1d8593d699314cc8ac09912532
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Jun 2013 01:10:39 +0800
Tag:    v2.5.1

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

commit 42a9e3efc2f0ef8e9d1a726e2d34e3e4ad597a68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Jun 2013 22:07:47 +0800
Tag:    v2.5.1

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

commit 4bc4844d5bf1f1885454bf7854ab935b0184daa9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 21:33:33 +0800
Tag:    v2.5.1

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

commit e58af1dfcdc2d88c0255c2554e924c674db9d0d6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:24:58 +0800
Tag:    v2.5.1

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

commit 4f0d6118ffc39f3eca143ef2c3665da2d8b40781
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 07:02:34 +0800
Tag:    v2.5.1

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

commit 8b77e812016cef3eb4846dbbe9558dbbeed4372e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:57:06 +0800
Tag:    v2.5.1

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

commit d6e2b0a03e2142ac317fb6c871e43aa9d5aa6760
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 May 2013 06:45:02 +0800
Tag:    v2.5.1

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

commit ab6a0ac4f7fca18c7f82c76fcd6267e537f49757
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 07:48:38 +0800
Tag:    v2.5.1

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

commit e3c1bd25935c5e748a5a29a9c6c3895e2bee4734
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 May 2013 06:44:22 +0800
Tag:    v2.5.1

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