Git merges in Moodle 2.5.2 by Dan Poltawski

commit 2d269d8a4f7f77bd22309154980948510e9e7086
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Sep 2013 14:43:20 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit f5fc0223109a978eebda1823f74ff786700ec2cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Sep 2013 10:38:19 +0800
Tag:    v2.5.2

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

commit a60215797d47fb510c9e922d3aa0d6c43513b8e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:58:52 +0800
Tag:    v2.5.2

Merge branch 'w36_MDL-41255_m25_changepw' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 5202933cddd846fee0a8bbe3b2b859a2d0191ee3
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 12:28:20 +0800
Tag:    v2.5.2

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

commit 3e07519d3f79928ed50d7a3dd58b9abdf7ea65dd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 11:48:58 +0800
Tag:    v2.5.2

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

commit fb7bb9af1628d4eea789d87ebc46919254cb34eb
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:40:34 +0800
Tag:    v2.5.2

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

commit 0522e090fbd48184d953361e37e951e395c719f7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 03 Sep 2013 10:06:48 +0800
Tag:    v2.5.2

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

commit 5e86f2ea868bf224faf6c77d2975d99ed2821110
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 17:25:38 +0800
Tag:    v2.5.2

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

commit 37d1f21b36d6350063307e3de8d00882a761d28a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 15:24:23 +0800
Tag:    v2.5.2

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

commit 0ab8ba8bf94d74b1133afc2d6b840ab7441d4332
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 14:10:39 +0800
Tag:    v2.5.2

Merge branch 'MDL-36093-moodle25' of github.com:StudiUM/moodle into MOODLE_25_STABLE

commit 5218a6e8fb169878f3237e92a0deeb71d2427cfd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:52:21 +0800
Tag:    v2.5.2

Merge branch 'MDL-41175_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 581a1695acd6ef39bf3100df253a4d387be943d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Sep 2013 11:44:58 +0800
Tag:    v2.5.2

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

commit cb096cef51e922e9530d57ce5aa491f11d646eb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 18:09:41 +0800
Tag:    v2.5.2

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

commit 44e1bb52ece8f13914d68efaa9e878e2a97e1355
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 14:08:14 +0800
Tag:    v2.5.2

Merge branch 'MDL-41321_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

commit 60426b9a2d79ff5e3554189a38a729b1371cad12
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 13:52:22 +0800
Tag:    v2.5.2

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

commit abfbffa640cf0bca794d579fb04f977a073b39e4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 27 Aug 2013 11:03:48 +0800
Tag:    v2.5.2

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

commit 0846c3a54a9361d957529bf26d3c9b6700c286f9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 18:07:00 +0800
Tag:    v2.5.2

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

commit 9a29baa05ed8674924f6f77e0b98c8aafded5594
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:56:34 +0800
Tag:    v2.5.2

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

commit 7f3b8fa7b7a6922d1830acbeecb183e4e89935d3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 14:25:29 +0800
Tag:    v2.5.2

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

commit c9b822387bb478f91a7c22acd9081c9d942654ce
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 26 Aug 2013 13:11:10 +0800
Tag:    v2.5.2

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

commit 6c98669c9bc70b901f4b229d0fd8828328bbac29
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 11:18:01 +0800
Tag:    v2.5.2

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

commit c36c24ec26ebad33bff36a72dad2cc50ce5ff6af
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:14:40 +0800
Tag:    v2.5.2

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

commit 2799d45f0867fcdd66b3a5a2e5bbb5cc3db76e65
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Aug 2013 10:05:11 +0800
Tag:    v2.5.2

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

commit 94bcd74360132269e51461f07af6f8d3bae51452
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 15:17:52 +0800
Tag:    v2.5.2

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

commit e1435f9e6e6de912d58804e080691c0b3ba1423f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 11:35:58 +0800
Tag:    v2.5.2

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

commit 69504a715482f65d8c1987fb4b2b38c7b41943ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 21 Aug 2013 10:44:39 +0800
Tag:    v2.5.2

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

commit ba54a0b296bce0978ba2990fc3ed9f695fab4195
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 11:34:20 +0800
Tag:    v2.5.2

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

commit 23756ddfead89e19c9135d40a4c7fa048ad8b741
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Aug 2013 10:48:09 +0800
Tag:    v2.5.2

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

commit 31235acf2b38d7c25bdafabe3e361b14f545118b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 17:51:11 +0800
Tag:    v2.5.2

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

commit 2febf2022370e2422aa6b30ca64cc0e9a543494f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 14:50:10 +0800
Tag:    v2.5.2

Merge branch 'MDL-40893-25' of https://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit b31d9b8cbd7806519fc2f3071d1d32e22424c348
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Aug 2013 12:57:50 +0800
Tag:    v2.5.2

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

commit 2571672496158da5a3ce89dff04b0f7d83e8f25f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 15 Aug 2013 16:41:41 +0800
Tag:    v2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE

commit 0d8d0a34e787349466c9b48b35c67e8cc8d814fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Aug 2013 21:57:43 +0800
Tag:    v2.5.2

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

commit 2d0f4897595cc4859fd735955f19fae412acafb5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Aug 2013 09:53:09 +0800
Tag:    v2.5.2

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

commit c6a8d2c08ca6fdb5b845111f6e13aed9a2c8f7e2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:41:59 +0800
Tag:    v2.5.2

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

commit 666d9bea6b76dcbf4352dd786a86a1b0265bf0d7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Aug 2013 16:13:20 +0800
Tag:    v2.5.2

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

commit ff8d9b59ef7d2748aeff643da0b443dc3b07d153
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 15:24:54 +0800
Tag:    v2.5.2

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

commit ae19a843bc709c00f4f10f307d4f2429053bdaf8
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:56:46 +0800
Tag:    v2.5.2

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

commit c79efe260bc842aa8e1dd54ee3d66fceaade20e3
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:30:35 +0800
Tag:    v2.5.2

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

commit 673a4563431760c3d170d35c685467c0a7d0a9c6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 13:21:12 +0800
Tag:    v2.5.2

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

commit 2018e8f12af4f97d884374701b8b9fbed10afcb7
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 12:40:12 +0800
Tag:    v2.5.2

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

commit 3d4cb04ded4715a9384c85a9b6f49f7b2738a46b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 29 Jul 2013 10:09:53 +0800
Tag:    v2.5.2

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

commit c38a4b6f04ea739a50038adaaab3ad994ee2e058
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:45:22 +0800
Tag:    v2.5.2

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

commit 4353b3d830e444f7c653383886164ef983be711d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 16:38:17 +0800
Tag:    v2.5.2

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

commit a8369f6a962621f3fe18f0423226f1727c2b9c0f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 13:34:29 +0800
Tag:    v2.5.2

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

commit fdcad4d5f3678808d653b223ba055fcf9c923fea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 12:38:27 +0800
Tag:    v2.5.2

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

commit 1f506acf583ddf9a1daaefa99c9ebacbfae578bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Jul 2013 10:42:07 +0800
Tag:    v2.5.2

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

commit 6ca8973eca94fac993a1af0352bd8504984f99f2
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 17:00:56 +0800
Tag:    v2.5.2

Merge branch 'w30_MDL-38867_m25_gspell' of https://github.com/skodak/moodle into MOODLE_25_STABLE

commit 114b8bed28d0f43fa4de9f00ad943e52967f8855
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 15:02:21 +0800
Tag:    v2.5.2

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

commit 4896a0ba25833e1a82d3a67bb10ca04f04592595
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:46:47 +0800
Tag:    v2.5.2

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

commit d46d40d407bb338cebbff903b82ce332e802745b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Jul 2013 10:31:47 +0800
Tag:    v2.5.2

Merge branch 'wip-MDL-37333_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE