Git merges in Moodle 2.5.5 by Damyon Wiese

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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