Git merges in Moodle 2.2.5 by Eloy Lafuente (stronk7)

commit 2376d7125b891df4d3dfcbec9f130aabdb17f396
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 08:18:30 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 09cca2d7aad63aa2256399c36dd20c8d49f7c692
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:12:22 +0800
Tag:    v2.2.5

Merge branch 'MDL-34945-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit e7920065ac8a3d23657646b8e93ca9781acd527a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 Sep 2012 02:08:05 +0800
Tag:    v2.2.5

Merge branch 'MDL-34985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE

commit 222abcddd4c9e346241b5dfa6fd706a942653ea5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 06 Sep 2012 07:18:54 +0800
Tag:    v2.2.5

Merge branch 'MDL-35034-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit da91c22212746d4bccf17b66d0de616bb867aa12
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 19:13:53 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35077_m22_stats' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit d84df9f5a6a3e38eba6971f0fc796ea38bc2ccac
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 05 Sep 2012 06:53:50 +0800
Tag:    v2.2.5

Merge branch 'MDL-34997-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit e20371b31669d46d18dd2b6ed71a376c2438cde8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 08:09:37 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-34606-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 81baf0d5f30f9b22ee68f41c96f4d1790bb7ee43
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:54:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-34633-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit befce5863d508fbc75684ec19ce850803c0a99a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:14:33 +0800
Tag:    v2.2.5

Merge branch 'MDL-29662_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 948835483a2258941d2d6654a0dd00f826aa98ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 07:08:07 +0800
Tag:    v2.2.5

Merge branch 'MDL-27818_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 3db989d41ea6949559bb079088e696dcfc787896
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:31:23 +0800
Tag:    v2.2.5

Merge branch 'MDL-33306_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 81f6a19377fef11efa437da7f1d3af011ffc5271
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:20:38 +0800
Tag:    v2.2.5

Merge branch 'MDL-33812-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 91f65d0ab4142b62474eebe0f13377b125c5ed14
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 06:02:01 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-34097_m22_environment' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 7b3a9020e62145305c74518e4f52a16955dad2ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 04 Sep 2012 02:02:33 +0800
Tag:    v2.2.5

Merge branch 'MDL-28346-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 06d5f84d71b9835ca6dbca735179539f40d8697f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:54:45 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35077_m22_stats' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 8918cf7b0d94584d6596f5849f43c677e7aaa2c5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 23:48:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-35133_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d7831c74bef1cf07351850899ea4689d04d6800e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 03 Sep 2012 22:18:33 +0800
Tag:    v2.2.5

Merge branch 'w36_MDL-35145_m22_guestdelete' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 5fcba2f9c8dd12024d013d01131c2fd9f6d49c76
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 17:27:45 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 165bfe54543426694d182100c6599cfef39eac45
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 02:12:15 +0800
Tag:    v2.2.5

Merge branch 'MDL-35147_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 049b47ca09ec8ba643fe1225c0d606634d5b441c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 31 Aug 2012 00:32:20 +0800
Tag:    v2.2.5

Merge branch 'MDL-31244_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 06606caf718d532db04f89051b82228bc01084f4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 18:15:29 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-30121-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 90241eaaf86b715341b62c05c4da69c72cefd8e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 05:24:11 +0800
Tag:    v2.2.5

Merge branch 'MDL-29598_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE

commit 6e8d3ac1bfe8557c4f5d535256bf7c8340b7a50d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:12:48 +0800
Tag:    v2.2.5

Merge branch 'MDL-25492_22' of git://github.com/jmvedrine/moodle into MOODLE_22_STABLE

commit 1c37f8865d7a9312eab2480b913049f3bf345114
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Aug 2012 02:10:43 +0800
Tag:    v2.2.5

Merge branch 'MDL-31837_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 4df4c677bd8ad056c426adf16e846356b296deb6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 02:04:16 +0800
Tag:    v2.2.5

Merge branch 'MDL-34406_fullname_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

commit 3dd9961f449fb367fff5e737c5edd3fc6ade3cbd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:51:25 +0800
Tag:    v2.2.5

Merge branch 'MDL-34430_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 006052e19c127f24379ce2032ce94541b3cd0caa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:36:19 +0800
Tag:    v2.2.5

Merge branch 'MDL-34993_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 31970a66a85f44d999beb294a64739879fce22f5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Aug 2012 00:23:45 +0800
Tag:    v2.2.5

Merge branch 'm22_MDL-34994' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE

commit e5783fd132e9147aacefcfa6a3feee5bba1ea4f3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:54:55 +0800
Tag:    v2.2.5

Merge branch 'MDL-35026_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 70c160f27df55ebe6d7f050f47a188ec7b9a62cd
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 23:51:41 +0800
Tag:    v2.2.5

Merge branch 'MDL-35003_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit c06b18a47554bbb4ebeb815ba46db70972619db9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:34:02 +0800
Tag:    v2.2.5

Merge branch 'MDL-35023_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit aa81647c4c65f3c46113359d3e37a87fb67e3e2c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 27 Aug 2012 22:17:06 +0800
Tag:    v2.2.5

Merge branch 'MDL-35055_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 956592f590ab2b128b18198a884d158d51232f39
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 24 Aug 2012 01:18:56 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit d90e2237fe0d7b600c37c0e2cce48bb3ec5ca975
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:34:35 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-32759-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 407c0fbcd619d68c3ed511538811f529334cc8ba
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 22 Aug 2012 08:12:11 +0800
Tag:    v2.2.5

Merge branch 'MDL-34702_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 0142a4b5953bbd776a2ced7621cbb8f4e38c2622
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:29:08 +0800
Tag:    v2.2.5

Merge branch 'MDL-29847_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit d60f8ef2db09f606f8a24245724a41a12dcc51c7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 07:23:52 +0800
Tag:    v2.2.5

Merge branch 'MDL-31957-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE

commit de4c3e62cfdecd63bd6d72c230f642429ed5d66e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 21 Aug 2012 02:18:37 +0800
Tag:    v2.2.5

Merge branch 'w34_MDL-34868_m22_gmapsv2' of git://github.com/skodak/moodle into MOODLE_22_STABLE

commit 85bd3fd899a635266f960fd3227d5e9bf6d90552
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 22:28:38 +0800
Tag:    v2.2.5

Merge branch 'MDL-28531-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

commit 59e2a775961201c213bb65237595e597ae730ac2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 20 Aug 2012 19:59:55 +0800
Tag:    v2.2.5

Merge branch 'MDL-34529' of git://github.com/jasonilicic/moodle into MOODLE_22_STABLE

commit 2ebd2721243b62bc48cd164f85d584d30456d236
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 16 Aug 2012 23:22:18 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 4dd7c5cafd214eda4a04cda6ac4c8e7444014a10
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 15 Aug 2012 09:32:59 +0800
Tag:    v2.2.5

Merge branch 'MDL-34862_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit 20244afd2c4b5b27efd6ff460beff7a383c403a8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:46:25 +0800
Tag:    v2.2.5

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE

commit 8a991d869292ff199b9ff6f3a0741c2692ca24bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:54:12 +0800
Tag:    v2.2.5

Merge branch 'MDL-34704_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

commit eab358f9161901ed6f89224f408560d5b13de387
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 08 Aug 2012 07:01:28 +0800
Tag:    v2.2.5

Merge branch 'wip-mdl-30792-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

commit 12b7b430a43f7f0570b352f188e10fb7f1f8733e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 07 Aug 2012 08:12:57 +0800
Tag:    v2.2.5

Merge branch 'MDL-31753' of git://github.com/enovation/moodle into MOODLE_22_STABLE