Git merges in Moodle 2.5.6 by Dan Poltawski

commit 7ff7ebef40061d2771bbf6f38907eabc03904eb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 May 2014 10:51:59 +0800
Tag:    v2.5.6

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

commit 8adc7c37c550d657076d618981d220bfde73a950
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 16:40:46 +0800
Tag:    v2.5.6

Merge branch 'MDL-45410-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE

commit f532c413471f7a928cdb2f9413e1db8e789f8719
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 12:05:36 +0800
Tag:    v2.5.6

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

commit 1eb784b79af964ca8cb07973e5961d7dbb6087fb
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 May 2014 11:50:15 +0800
Tag:    v2.5.6

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

commit b001cabae351228e54c4d47a4b33ba1f85930357
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 12:07:00 +0800
Tag:    v2.5.6

Merge branch 'wip-mdl-45383' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 466a121117e53879fdfeba6ff446ebd36d71a864
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 May 2014 11:17:13 +0800
Tag:    v2.5.6

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

commit b12749ee0e48628464de5dd386492c3281648b4a
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 May 2014 17:44:12 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

commit e8839b4184bdc2889016ea31851be9a91f600545
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:52:09 +0800
Tag:    v2.5.6

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

commit 6a8ebfcd37ea6bde515aba05595bb961753eb5bb
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 14:36:10 +0800
Tag:    v2.5.6

Merge branch 'MDL-43570-M25' of https://github.com/KristerV/moodle into MOODLE_25_STABLE

commit ddd764639f9e9e583d3896d63f9ca8b2a59f3a34
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 01 May 2014 10:41:03 +0800
Tag:    v2.5.6

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

commit 2b447f7df9ae0f2cd3f017bbfda847f2f648ecde
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Apr 2014 14:58:59 +0800
Tag:    v2.5.6

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

commit 7732473108d75fed8c58cbbe91bbe47818d869e5
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 Apr 2014 13:56:32 +0800
Tag:    v2.5.6

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

commit 19ce7a47d903db2f403abc3f4aff2ec09281dc28
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 17:56:21 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

commit 391726782e0388af2f00abf9b9924590565b7e85
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Apr 2014 10:01:01 +0800
Tag:    v2.5.6

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

commit b24067ce0f05589af0c8ad22db90e76324ac0818
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:40:22 +0800
Tag:    v2.5.6

Merge branch 'MDL-45172_block_25' of https://github.com/andyjdavis/moodle into MOODLE_25_STABLE

commit 7b59af440dd6ef8f59e92bb01e71a7050e62ae1a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 16:16:29 +0800
Tag:    v2.5.6

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

commit 5c500501334eb55084b23d9c43dd3a626421d6e9
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Apr 2014 14:23:22 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-45148-25' of https://github.com/mackensen/moodle into MOODLE_25_STABLE

commit 040b8cd17f08a2d7a89e516c1d9ba0d590fdcbdb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 22 Apr 2014 12:36:17 +0800
Tag:    v2.5.6

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

commit 2b77a4e58edf914974f79be0cef679ff5b8879bc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Apr 2014 14:42:09 +0800
Tag:    v2.5.6

Merge branch 'w16_MDL-45049_m25_debugging' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 7759b28bd3deb7f7ed1a8c1920c01c7dd0a98d6b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 14:55:33 +0800
Tag:    v2.5.6

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

commit 9cf90f9c77335bbc2fec1044d1720fbe4e5fb3ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 11:05:56 +0800
Tag:    v2.5.6

Merge branch 'MDL-43789_25' of https://github.com/rajeevs1992/moodle into MOODLE_25_STABLE

commit 735347134fcaf7339c7d4e1b0b5e27e7eaa29b68
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 10:05:27 +0800
Tag:    v2.5.6

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

commit 8dafdfbe863bbc377d93bcf01714f9c472bfff38
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Apr 2014 09:57:23 +0800
Tag:    v2.5.6

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

commit 23d7cdaa2407b688511192c48dab7d81283dc0af
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 14:35:04 +0800
Tag:    v2.5.6

Merge branch 'wip-mdl-44977-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 5d3b26c3501a717ec6977da25c819ce473c4005f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 13:56:41 +0800
Tag:    v2.5.6

Merge branch 'wip-mdl-44979-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit 58eea2b5000185018c6dde1aef60550f467d26ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Apr 2014 09:10:34 +0800
Tag:    v2.5.6

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

commit 64b88aa9487e011b04af2279093d6f1c7be2bca6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Apr 2014 10:02:01 +0800
Tag:    v2.5.6

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

commit f4f0dbed33d55e0474f5feeba5b0e5ed4e7e09dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 11 Apr 2014 11:40:00 +0800
Tag:    v2.5.6

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

commit 19fd2cbb0209716c0e8f1768f3e19addbd7aabc0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 Apr 2014 13:10:42 +0800
Tag:    v2.5.6

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

commit 584c7d3da7960ea131716a15fa1a829c1387deaa
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 12 Mar 2014 09:09:19 +0800
Tag:    v2.5.6

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

commit 46e5012aa71fb86cb76fc4b74dccd6f52866c15d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 15:41:54 +0800
Tag:    v2.5.6

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

commit d3561684328c3e11786c52ad99264de32dd7da59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 14:33:22 +0800
Tag:    v2.5.6

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

commit 549f507e78ab5612b7ea1d0762871b645bed66ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 11 Mar 2014 11:37:50 +0800
Tag:    v2.5.6

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

commit 57ce177561d99c476a9a9fbba8050ecee21f1157
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 10 Mar 2014 12:04:17 +0800
Tag:    v2.5.6

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