Git merges in Moodle 2.5.5 by Dan Poltawski

commit 3ca102e45a37b68974400d0cb8b511f8aae077f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:25 +0800
Tag:    v2.5.5

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

commit 0634e5d5811bc2ff2bd3b1f63dd0dd8a3cc0cc8e
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:40:01 +0800
Tag:    v2.5.5

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

commit 12e33d79c07efb345a6fbb5fc6ebd4108cddde54
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:28:10 +0800
Tag:    v2.5.5

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

commit 27a3ba41d21e497889a13e8163348973fdc47184
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:29:25 +0800
Tag:    v2.5.5

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

commit b8cccad3232b2927fca7f72fffc4e293970215ed
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 10:52:50 +0800
Tag:    v2.5.5

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

commit 1533381d618863fa80adf1d93b1ce0b27d296f58
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:46:24 +0800
Tag:    v2.5.5

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

commit 3104f89ec8ecfefcdfa1b704e05f8d62fcafedc4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:41:31 +0800
Tag:    v2.5.5

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

commit cd0281f97e6dd3e8afeb58ced327228651c57717
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:15 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43852_SWF_Not_Embedded_By_Mediaplugin_Filter' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 1249c069bbe78d793f42310148da889a01d22d51
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:23 +0800
Tag:    v2.5.5

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

commit ed28719f0327ebd61d725a60497ad04e24804177
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:21 +0800
Tag:    v2.5.5

Merge branch 'w06_MDL-43344_m25_flow' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 361604089e4ff22ca5deff18b14742788d3bdb51
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:34:03 +0800
Tag:    v2.5.5

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

commit c1a7185e62a451c896aae0efac4142dba778ec0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 10:30:38 +0800
Tag:    v2.5.5

Merge branch 'MDL-43405_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE

commit 4aceac629450914e6aea97cae24c43bf69ea3276
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Feb 2014 09:16:51 +0800
Tag:    v2.5.5

Merge branch 'MDL-43182_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit 71ca9c1d48fbae864f3cd361547f41a8579542f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:14:02 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43541' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 13628d19a81e99a6722acba6ab7f09025f2ecfee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:14:21 +0800
Tag:    v2.5.5

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

commit 392c6008733c5c42e8c192811f14c237dad85f65
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 12:06:46 +0800
Tag:    v2.5.5

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

commit a392332a28afb09776a34d5227eb9c6508bf0992
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 17 Feb 2014 10:32:37 +0800
Tag:    v2.5.5

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

commit 5ac8f08a2db4f8fc57f8680bf36625562f131490
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:29 +0800
Tag:    v2.5.5

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

commit 5f69d9c594a98f63255e3d4cf9b573d026cbe864
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 15:21:20 +0800
Tag:    v2.5.5

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

commit 4bdaa6a78d82acd230cec23a9c641ef52f40c51d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:29 +0800
Tag:    v2.5.5

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

commit 7bf3f870f50a6c20a8ec29527c4ed471c8b45f46
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:56 +0800
Tag:    v2.5.5

Merge branch 'MDL-43693-MOODLE_25_STABLE' of https://github.com/lucisgit/moodle into MOODLE_25_STABLE

commit 785e7d36a7a063d21ca97835f7df68a5afe161db
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:23 +0800
Tag:    v2.5.5

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

commit d85aad0a18de97eb1cee2ad2aaab1db01b4e1b83
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:26:43 +0800
Tag:    v2.5.5

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

commit 1b87b7232e16d7573d568aeeae775d061451e013
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:41 +0800
Tag:    v2.5.5

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

commit be34306a6031711736805ccd782850bc2a8fc717
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 12:56:23 +0800
Tag:    v2.5.5

Merge branch 'MDL-42980_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit 4abee6b22583894e95437362c831a1a29ce990fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:51 +0800
Tag:    v2.5.5

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

commit 44e7dfe7a036c32b6dcfcc14ef43e5b2290a26c5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:39 +0800
Tag:    v2.5.5

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

commit c0486e9b91131b53a79e691ff9024fd8af960690
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:45:48 +0800
Tag:    v2.5.5

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

commit a0147ffa28fba2425b3db5270005ceb7e9ec871b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:26:22 +0800
Tag:    v2.5.5

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

commit 4703d6ba201ecc64163a1c0dd54451d0b6efbf83
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 15 Jan 2014 08:20:39 +0800
Tag:    v2.5.5

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

commit e2565b23b78e4236834810fea3a919e238b1e27e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:58:14 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 155c7dfd1354b0c9a74ba7c7e199eaf28132fd6c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:53 +0800
Tag:    v2.5.5

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

commit 371714075266167ff8bb116f300f4c52ab0d2cac
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:37:01 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle into MOODLE_25_STABLE

commit 3f1b2de488fbef8c89d9990eb8c978997694e7ba
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:46 +0800
Tag:    v2.5.5

Merge branch 'm25_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE

commit 6462a6308b38688d852e2bd814c1fde797675f87
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:36 +0800
Tag:    v2.5.5

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

commit 3c1c78cef2c7c62975b2ae4339651c0de11c49cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:50:48 +0800
Tag:    v2.5.5

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

commit 6584492f0784a1af3de2028df89cbdb15c0b47b0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:35:04 +0800
Tag:    v2.5.5

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

commit 6fb9497847a1a434040912c0416f3d8652ed8c16
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:12:06 +0800
Tag:    v2.5.5

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

commit 36785d10dea720e61bd49ec0766ecdc26039166e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:03:39 +0800
Tag:    v2.5.5

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

commit 9a443297f7515d3467b2f81510ece8a5533c0d08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:56 +0800
Tag:    v2.5.5

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

commit ac76e9b79758c3dfa2e0788d18a0f2296fc0f591
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:16 +0800
Tag:    v2.5.5

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

commit 0dc14c0b5685dd7a5cf64a0de4df780e96abc80c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:36:35 +0800
Tag:    v2.5.5

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

commit 60a188b9f365cd23124e6d6ef0643af53278d0a5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:26 +0800
Tag:    v2.5.5

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