Git merges in Moodle 2.6.2 by Dan Poltawski

commit 864ea90d6d553fb0e166be76d842f910d914449a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:18:22 +0800
Tag:    v2.6.2

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

commit 7442e32e87d3a6c7ad7c6bbc3650307d99529806
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 14:13:35 +0800
Tag:    v2.6.2

Merge branch 'MDL-43930-26-fix1' of git://github.com/damyon/moodle into MOODLE_26_STABLE

commit a77f82dacf2cd43a1612ec61c3345ec7c26afcb8
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 12:39:56 +0800
Tag:    v2.6.2

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

commit ed9e1428d13a96d74716012a5435af18606b0d13
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 05 Mar 2014 11:22:37 +0800
Tag:    v2.6.2

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

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

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

commit 602a3bd3decaefb533ff83226775de7cb0ce9c59
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 17:50:07 +0800
Tag:    v2.6.2

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

commit 5b2f2af6cd62db5c33458a936ce3c14a722aa205
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 16:00:01 +0800
Tag:    v2.6.2

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

commit 6a37f9898e4d23930cb6a3ba095ce9570d3e637c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 15:43:26 +0800
Tag:    v2.6.2

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

commit 5d4abb97b21212db0738d16b514aa784abca4271
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 14:41:32 +0800
Tag:    v2.6.2

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

commit 013de6d5d47ec0416e4f73ec7a23af6615bd22ca
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 04 Mar 2014 12:56:13 +0800
Tag:    v2.6.2

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

commit 51214dd2d18e1238d0eee299ccf7a8d418cdb228
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 15:15:20 +0800
Tag:    v2.6.2

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

commit d5c7462a6a4cdc03f0b8b47b5e5edec2ac79e34c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 13:34:35 +0800
Tag:    v2.6.2

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

commit 6b25f55ec9cf04776dd26ccf3644f59203305630
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 03 Mar 2014 10:07:15 +0800
Tag:    v2.6.2

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

commit 233f8b265a5c947d110dc0580d27e162d84c6b9c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 25 Feb 2014 15:34:00 +0800
Tag:    v2.6.2

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

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

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

commit a43aa9fbf13606eb0a16c0dcb50ecc0a0c4a3fdc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 19 Feb 2014 09:16:49 +0800
Tag:    v2.6.2

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

commit 29b3c5dfc6fdbf1e920bbc309d1769cad67817b1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Feb 2014 14:14:00 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-43541' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

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

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

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

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

commit 8f89ca5780df1a3cbf7a7c58a969d75bf4b80e85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 23:29:25 +0800
Tag:    v2.6.2

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

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

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

commit 0469922b5fd6519973ff4f9a9cf1c64da8a36adb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:49:27 +0800
Tag:    v2.6.2

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

commit 1cbda6fabdaa6aec198dcb501da07b3775585ac0
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 14:28:52 +0800
Tag:    v2.6.2

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

commit 1f77f14fb93d3e8f78f4485e11a9bafb9339626c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:24:41 +0800
Tag:    v2.6.2

Merge branch 'wip-MDL-43700-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE

commit 574111a94e3ae3830a648483513e0868cdeec20e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 12:19:36 +0800
Tag:    v2.6.2

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

commit 66b74e5aa533cd2dfb23dbd06e1a73602a7138aa
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 21 Jan 2014 11:21:54 +0800
Tag:    v2.6.2

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

commit 5f074a6bb0eaf9947ea052d4c7d0ce4e6dedaef4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:29:21 +0800
Tag:    v2.6.2

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

commit 4f02d0074ac60155e2b2525cac2dfc991ee08d09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 15:25:49 +0800
Tag:    v2.6.2

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

commit 1605660ad21cc16fdf27945da1179a46d8fb7d59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 14:24:44 +0800
Tag:    v2.6.2

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

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

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

commit 37b0d3adad1f23ed391ec68f0e9c40e62f3344ee
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:53:53 +0800
Tag:    v2.6.2

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

commit da2e9d519b4c2ee81c785e2a001bcdfb09b73779
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 10:33:38 +0800
Tag:    v2.6.2

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

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

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

commit 0b8749c89217bf0c2823fc205ad498f9d6bbcd14
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 20 Jan 2014 09:26:12 +0800
Tag:    v2.6.2

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

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

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

commit f9d14c4cd7f977f12f087e9504d49479d25f76c7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 16:50:09 +0800
Tag:    v2.6.2

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

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

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

commit 33d83d755ac726fdb08397e604a3c642ed1f7dcb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:48:52 +0800
Tag:    v2.6.2

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

commit 4a2ac9676af8989fbb8271dc892c39886a74dccd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:37:04 +0800
Tag:    v2.6.2

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

commit 30354dc0d2a6256b412e4f2dfd8a22286dce1b7b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 15:26:52 +0800
Tag:    v2.6.2

Merge branch 'MDL-43178_forum_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE

commit 1e65c37e973e7ef354185057383a8115c28e1ba1
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 11:28:44 +0800
Tag:    v2.6.2

Merge branch 'm26_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE

commit b3eacbd5dafe0d233dafce3157ece07ab75b8a6f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 14 Jan 2014 10:46:34 +0800
Tag:    v2.6.2

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

commit a377868a50757dbbf94c8a95052fac9d735cdc31
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 15:50:34 +0800
Tag:    v2.6.2

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

commit 4d2984c136b892745c9fc3b50ca8155fd548c1e6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:37:26 +0800
Tag:    v2.6.2

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

commit 6719aa5ec57b6195127d896820a579baaf53021e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 12:34:58 +0800
Tag:    v2.6.2

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

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

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

commit 51bced46a7c64ef5e470deb2217c9a4c8f1f36d8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 11:03:37 +0800
Tag:    v2.6.2

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

commit a893680091eaa581263170cb6bfc0250a507e1f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:07:54 +0800
Tag:    v2.6.2

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

commit 67a75acaffc80e767d3fd9ef1a479cda0e055891
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 10:03:47 +0800
Tag:    v2.6.2

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

commit 892173b3f35e3fddb313953c154dd6dcdeaa94b9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 09:36:12 +0800
Tag:    v2.6.2

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

commit bc7a77f14d6f43b8c5fcf1546602acac34755b53
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 13 Jan 2014 08:54:23 +0800
Tag:    v2.6.2

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