Git merges in Moodle 1.9.12 by Eloy Lafuente (stronk7)

commit 9330414966265d477e6f1588e15d157091626465
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 02 May 2011 17:37:08 +0800
Tag:    v1.9.12

Merge branch 'MDL-26937' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit bd492232462a8a98ac90dbf914ab9f9a1f32661b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 11 Apr 2011 07:35:47 +0800
Tag:    v1.9.12

Merge branch 'w15_MDL-27069_m19_httpsrequired' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit d2cabfdf9b2c57f6689d52eee6c00b0f04b55b93
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 04 Apr 2011 17:39:51 +0800
Tag:    v1.9.12

Merge branch 'MDL-20946_19_simplehistory' of git://github.com/andyjdavis/moodle into MOODLE_19_STABLE

commit d6ed445589e376b49fc6abecf886cebfa18d415e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 29 Mar 2011 01:12:04 +0800
Tag:    v1.9.12

Merge branch 'w13_MDL-26966_19_urlparsing' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 19f65e6c6be4316b1503e16c873bceb6681dc090
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Mar 2011 05:52:16 +0800
Tag:    v1.9.12

Merge branch 'm19_MDL-25770_hotpotfix' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit 72250eed86717616ca830c070552f2281111277c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 23:29:02 +0800
Tag:    v1.9.12

Merge branch 'w11_MDL-26634_19_ldapset' of git://github.com/skodak/moodle into MOODLE_19_STABLE

commit 49e0d5d5e31a72b331c178d0b75187244ef080e2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:41:32 +0800
Tag:    v1.9.12

Merge branch 'MDL-19555_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE

commit fb7abd481b286dde388c174656af59c0dab18652
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:35:57 +0800
Tag:    v1.9.12

Merge branch 's7_MDL-9376_qaforum_m19' of git://github.com/dongsheng/moodle into MOODLE_19_STABLE

commit 7e06e9ff4a07b7c4d0b65f68883a52be7785e66b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 14 Mar 2011 08:32:18 +0800
Tag:    v1.9.12

Merge branch 'MDL-21446_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit 1b607c22665e9bac03ff28438806e89e88b8131d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 09:38:48 +0800
Tag:    v1.9.12

Merge branch 'm19_MDL-26672_aiccfix' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE

commit cddf3e16790cf3ca690f154f0319c125cdfdb2bf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 07 Mar 2011 08:25:53 +0800
Tag:    v1.9.12

Merge branch 'MDL-26324_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit 9044a8edb32b2476bc7cba9993aec766695884eb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 23:15:24 +0800
Tag:    v1.9.12

Merge branch 'MDL-26528_restore_forum_read' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

commit 86a8740b67fb9a0890d48b01641a705f8f89aeb9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 22:21:01 +0800
Tag:    v1.9.12

Merge branch 'MDL-26502_symbian' of git://github.com/stronk7/moodle into MOODLE_19_STABLE

commit 49a1b113ad1dca725a25c77fbbb97ea6141c6adb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 19:45:37 +0800
Tag:    v1.9.12

Merge branch 'MDL-25122_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE

commit eeff6a0839ff72d150b600c35a60138c0e33f9fa
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Feb 2011 17:56:28 +0800
Tag:    v1.9.12

Merge branch 'MDL-26505_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE