Git merges in Moodle 2.5.5 by Sam Hemelryk

commit 9ef6537e4cc52d9fdccc716c12f4516caf54641e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:16:36 +0800
Tag:    v2.5.5

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

commit 0c51cfefb7e001b3e4d8b62c9534cafcb29c156a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 05:15:39 +0800
Tag:    v2.5.5

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

commit 077aa1b431cdf7478bd52165d3ee35eba94be811
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 04:16:36 +0800
Tag:    v2.5.5

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

commit a2b2fa9b3fc8bf9aa84733e9e452a3a4d8b8e054
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 17 Feb 2014 03:48:52 +0800
Tag:    v2.5.5

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

commit 96dabdf68dc8b7c671203c57d245e59ce6232197
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 13 Feb 2014 03:25:47 +0800
Tag:    v2.5.5

Merge branch 'int25_MDL-43200' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit be1ae343eaaeba8cb6d52a49f590d6b01e6ec5f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 12 Feb 2014 04:24:08 +0800
Tag:    v2.5.5

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

commit e91a87511bb0b021cede298a64c7f7241f9ad192
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 09:10:55 +0800
Tag:    v2.5.5

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

commit 04324e81e2734419e5f9f585c8565df14b9f5b02
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 11 Feb 2014 03:27:40 +0800
Tag:    v2.5.5

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

commit f7dea8ae75df256aa5ff501086ca9cf1b1c39057
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:26:18 +0800
Tag:    v2.5.5

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

commit 36803e0f78a4f750a722c8e0b63034f4d5bc048c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 10:20:20 +0800
Tag:    v2.5.5

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

commit d42f989c8150592268dbd032729aea2b13677abe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 09:16:17 +0800
Tag:    v2.5.5

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

commit d97c8c30ea306ff86ea3c728a4925f58b426a0aa
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 08:13:00 +0800
Tag:    v2.5.5

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

commit 074b8b2989576de199ff2feced0ce4b89b6530a1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:30:16 +0800
Tag:    v2.5.5

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

commit 3c1bba2b114d020600330868808b10063d00f614
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 06:27:07 +0800
Tag:    v2.5.5

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

commit a29f1f962990b9b3e8f6525989dd4d4f5fbdfa94
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:40:17 +0800
Tag:    v2.5.5

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

commit 579319888cbff51abbc62a9538dc099c298a89c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:31:01 +0800
Tag:    v2.5.5

Merge branch 'MDL-44020-STABLE-25' of git://github.com/jleyva/moodle into MOODLE_25_STABLE

commit 1ffb89f9b8b81da7f5b61a0ba1e3aad373b7ca44
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:28:14 +0800
Tag:    v2.5.5

Merge branch 'MDL-44046_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit 5afb7fd120445877d658a2c4b864a6efcf3d5397
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:23:56 +0800
Tag:    v2.5.5

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

commit 966bb0f45a94724fa38a1882b2a07526d291a868
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 04:06:35 +0800
Tag:    v2.5.5

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

commit 202e947ffc2fc2db1ae8dd7e4e9b30750a6542cc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:44:50 +0800
Tag:    v2.5.5

Merge branch 'MDL-44029-quiz-group-delete-handler-bug_25_STABLE' of https://github.com/mpetrowi/moodle into MOODLE_25_STABLE

commit 1397e103ba4d04b10628eb6e2b54745ff9bff9a2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 10 Feb 2014 03:42:59 +0800
Tag:    v2.5.5

Merge branch 'MDL-43946_m25' of https://github.com/merrill-oakland/moodle into MOODLE_25_STABLE

commit ab34537ca49cf25fb790c79bb4a85e0501e5ce75
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 10:23:57 +0800
Tag:    v2.5.5

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

commit 06ce535d9c1dd6df888a128393ae8e08da6fc70e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 07:38:25 +0800
Tag:    v2.5.5

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

commit 8aaf8591f1e834f50ac9229bddbac1bb351ea398
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:57:32 +0800
Tag:    v2.5.5

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

commit 23ca363633cd37471011ae246d4e45479f26323e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 05:47:04 +0800
Tag:    v2.5.5

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

commit 881b8443ce42c59e364d7e53fa2ad747eda8d665
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 04:11:36 +0800
Tag:    v2.5.5

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

commit 5461c61f02250da49973b91e8103c674ab2ee5c3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 04 Feb 2014 03:29:09 +0800
Tag:    v2.5.5

Merge branch 'wip-MDL-39942-MOODLE_25_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_25_STABLE

commit 9b14c62e98c556362665283c6ff971e4996b4389
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 28 Jan 2014 07:16:23 +0800
Tag:    v2.5.5

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

commit 6536f04a5e5fdf28c0897d7ef74c74f68b592c4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 27 Jan 2014 06:32:20 +0800
Tag:    v2.5.5

Merge branch 'w04_MDL-43746_m25_courselogin' of https://github.com/skodak/moodle into MOODLE_25_STABLE