Git merges in Moodle 2.6.3 by Damyon Wiese

commit f6f25e404060aae3afd7120f24989cd33424f4ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 08 May 2014 10:04:03 +0800
Tag:    v2.6.3

Merge branch 'MDL-45304-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

commit 64e366c82bff562d9ef23728274b48f1f2f0cd65
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 May 2014 13:29:42 +0800
Tag:    v2.6.3

Merge branch 'MDL-45290-26-fix2' of https://github.com/jethac/moodle into MOODLE_26_STABLE

commit 5684f787eeefe63811ab9644f8e885cc232e627e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 May 2014 12:02:33 +0800
Tag:    v2.6.3

Merge branch '45412-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

commit 53a28c9528ac6ca2eec631c9b9648397bdbadf55
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 May 2014 11:25:10 +0800
Tag:    v2.6.3

Merge branch 'MDL-45290-26-fix' of http://github.com/jethac/moodle into MOODLE_26_STABLE

commit 5a0e3521b932fa8cd2d17bbd082247307a189ca0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 May 2014 17:25:05 +0800
Tag:    v2.6.3

Merge branch 'MDL-45359-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 76e28ec58a881050598df961571bb5d1a18d990f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 May 2014 10:53:18 +0800
Tag:    v2.6.3

Merge branch 'MDL-45290-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

commit 4176b66597a89ad8cea1e28f0309fd1c672347ae
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Apr 2014 17:23:50 +0800
Tag:    v2.6.3

Merge branch 'MDL-45166_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE

commit 68798bec466e3dca5b63ce2d3f9ddc6076bf5a5f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Apr 2014 15:58:07 +0800
Tag:    v2.6.3

Merge branch 'mdl44575-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit c814c5f9474f1d94a864b222b8b4b3b8ae90a61a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Apr 2014 10:22:01 +0800
Tag:    v2.6.3

Merge branch 'MDL-44916-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

commit f91bf9a768c4fa7294887db0e7ac71e3aa95fd8b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Apr 2014 17:08:12 +0800
Tag:    v2.6.3

Merge branch 'MDL-45079_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE

commit b7a172cc239d396782a01171109b9535c6e4833a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Apr 2014 10:52:46 +0800
Tag:    v2.6.3

Merge branch 'MDL-45268-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE

commit edaf96a19a381fd0946bd7dc69e0c572d36bf369
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 16 Apr 2014 11:13:12 +0800
Tag:    v2.6.3

Merge branch 'MDL-43277-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

commit 060c55b39afa1b05ba6331ed7045eb6a8307109a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 15 Apr 2014 15:03:38 +0800
Tag:    v2.6.3

Merge branch 'w16_MDL-45098_m26_mariaenv' of https://github.com/skodak/moodle into MOODLE_26_STABLE

commit da4533bcd4f25e89274b097df63cf2a384f4b41e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Apr 2014 11:47:45 +0800
Tag:    v2.6.3

Merge branch 'MDL-44936-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

commit 8c3065911b4986fbff1eee4e95ffb78e8ba7c7cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Apr 2014 13:11:45 +0800
Tag:    v2.6.3

Merge branch 'mdl44669-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE

commit ed14b4c8e255bdb6108507b7037c2f2c0250c956
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 13:17:09 +0800
Tag:    v2.6.3

Merge branch 'MDL-41895-m26' of https://github.com/micaherne/moodle into MOODLE_26_STABLE

commit b2b6b83028bc98d7191229044a33ea09d9a6b5bd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 16:27:37 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-40843-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 55a65aed1979f7ea8eb7396f06a307af81e25814
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 15:21:34 +0800
Tag:    v2.6.3

Merge branch 'wip-MDL-43021-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

commit 82fbf8017133d15dc2a4708e00d83397081783f4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 02 Apr 2014 16:35:27 +0800
Tag:    v2.6.3

Merge branch 'm26_MDL-44753' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE