Git merges in Moodle 2.5.6 by Damyon Wiese

commit 716b8fc1bbaa1587bb8ac02a3e32a8ea4c423ced
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 May 2014 13:30:22 +0800
Tag:    v2.5.6

Merge branch 'MDL-45290-25-fix3' of https://github.com/jethac/moodle into MOODLE_25_STABLE

commit 5cdb2ff7c3f0d5c229419196ed6f15e06ed0826b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 May 2014 11:57:23 +0800
Tag:    v2.5.6

Merge branch '45412-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit e169e9ca704bfcdbb39c5a48fc7b3e845b33cc8e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 06 May 2014 11:22:04 +0800
Tag:    v2.5.6

Merge branch 'MDL-45290-25-fix2' of http://github.com/jethac/moodle into MOODLE_25_STABLE

commit 955b72bd544977e4d892d48417e88886d813b97e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 May 2014 11:01:30 +0800
Tag:    v2.5.6

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

commit 7b82edb2f82d4732347f2a764d0200bc3e71ba1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 30 Apr 2014 16:00:20 +0800
Tag:    v2.5.6

Merge branch 'mdl44575-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit 806014d3d07de606437703322dd4cde3f957b5fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 29 Apr 2014 10:37:52 +0800
Tag:    v2.5.6

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

commit 73ec7fdab7a5194f8185d94328347facd7793859
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Apr 2014 17:11:57 +0800
Tag:    v2.5.6

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

commit 3e4806625a3eceae7e2f68415884cdc42448f20c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Apr 2014 10:53:07 +0800
Tag:    v2.5.6

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

commit 7c8bac1438f939c9cb3d2b92c757cc720f5ee4fb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 14 Apr 2014 11:39:22 +0800
Tag:    v2.5.6

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

commit 7d72f26d77846041698590502ac200f6968dd6d1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 09 Apr 2014 13:12:14 +0800
Tag:    v2.5.6

Merge branch 'mdl44669-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE

commit f6e2dde16d119546972dd5a7ff31ca536d1db75b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 08 Apr 2014 13:12:16 +0800
Tag:    v2.5.6

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

commit 3e7311717b2220f3e762a6906ee53a6012eb0624
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 07 Apr 2014 16:31:32 +0800
Tag:    v2.5.6

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

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

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