Git merges in Moodle 2.1.7 by Sam Hemelryk

commit 0ac34abbfbdc1847c9121bae3b3efd675072bafe
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 06 Jul 2012 05:49:24 +0800
Tag:    v2.1.7

Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE

commit 7d7f36787bf1bddfd7a0f59a94b41882e31f3583
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-32062_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

commit 17a759cf6111484291f3c77e4ae05efdffc17e57
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:41:26 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33749-MOODLE_21_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_21_STABLE

commit 30cab618e1c51b992b4215fe6191b9ab744277f7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:57:14 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33957-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

commit 75aa150051eb95cedde699102d3af1e8c86124a7
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 07:47:58 +0800
Tag:    v2.1.7

Merge branch 'MOODLE_21_STABLE-MDL-33770' of git://github.com/mouneyrac/moodle into MOODLE_21_STABLE

commit 40f00ad784d6ca83abd0706bfdc10e2e1f62e017
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:31:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-33932_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit 45181b1553aafd9423a40f030eae9dd67b6c8d14
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 10:05:42 +0800
Tag:    v2.1.7

Merge branch 'MDL-33627_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit e2f3b1eea1a6487c64fdecbe62ab92a6e88fb879
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-34044-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit a4c4e43a5f7476ea3c823caa7671d1739c8a8bae
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 07:36:42 +0800
Tag:    v2.1.7

Merge branch 'MDL-27675_21' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit d25f6b810490fb3e4b5ba82e80d0fdbb47fea187
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 21 Jun 2012 06:06:24 +0800
Tag:    v2.1.7

Merge branch 'MDL-33808-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit 54e24c11a59f213c65dfe8d06ee5e9ea76bcc1a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Fri, 08 Jun 2012 06:20:31 +0800
Tag:    v2.1.7

Merge branch 'MDL-32325-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit c2cf907f3f5c58cd0e860dc2c85501724f0d60ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 11:24:03 +0800
Tag:    v2.1.7

Merge branch 'wip-mdl-33090-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

commit bed0c7a63ef8ed93b8f55095fa0ccb4383a25c39
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:59:34 +0800
Tag:    v2.1.7

Merge branch 'MDL-30837-21' of https://github.com/FMCorz/moodle into MOODLE_21_STABLE

commit 4c3a1c6f8a6e08d921d91d8ee5592a31d0b2de70
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:37:48 +0800
Tag:    v2.1.7

Merge branch 'MDL-31520-MOODLE_21_STABLE' of git://github.com/fabiomsouto/moodle into MOODLE_21_STABLE

commit 8ad117cca866e4d3385ddaa211f12cbb96098207
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:13:32 +0800
Tag:    v2.1.7

Merge branch 'MDL-31823_21' of git://github.com/dmonllao/moodle into MOODLE_21_STABLE

commit 7d4c5ac5ab77d729362563576d5b83d5bd0faa4f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:09:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33441-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit ded3134c3766bb7b7f03ac7f52e2caab2b91d000
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 06:05:57 +0800
Tag:    v2.1.7

Merge branch 'MDL-33487-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE

commit bc1f0e0b405ffc75a96a67b11e429a41c1d34ead
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jun 2012 05:07:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-26277-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

commit 27ee2b673775dc736f87c2974b2d286a0e726c76
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 09:51:01 +0800
Tag:    v2.1.7

Merge branch 'MDL-33364_21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

commit 9c96488ed967a5923fd082ab9b30cab9409f99ff
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:44:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-27675_21_wip' of git://github.com/grabs/moodle into MOODLE_21_STABLE

commit b22884274f8e7729c5a9145b3b355fb1d4b03527
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 07:21:45 +0800
Tag:    v2.1.7

Merge branch 'MDL-33191_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit ab833c6ee4634cf67bd688eeb7780267c58cf013
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 May 2012 06:52:03 +0800
Tag:    v2.1.7

Merge branch 'MDL-33325-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE

commit ebbf509960fcb0c53d2b39d2fae551d2711c5c9c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 07:23:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-32203c-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE

commit e09266d176f1af06d2614333c957f68e77750c7d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 24 May 2012 06:56:06 +0800
Tag:    v2.1.7

Merge branch 'MDL-26562-21' of git://github.com/vadimonus/moodle into MOODLE_21_STABLE

commit d7bce7db814d03a326128c4174b94468382a7e64
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 22 May 2012 10:49:07 +0800
Tag:    v2.1.7

Merge branch 'MDL-32204-mnet-auth_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

commit e76f4039b98a1c7697443e5bc1e4a4e9dad58036
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 10:42:10 +0800
Tag:    v2.1.7

Merge branch 'MDL-29399_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE

commit 2dfeb89f48fc68c241033a024aafabdc111f42b2
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 17 May 2012 08:27:17 +0800
Tag:    v2.1.7

Merge branch 'm21_MDL-32794' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE

commit 25f8be6e70b4f35a7d1c69afd3ddce2ee0ea547a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 16 May 2012 05:11:59 +0800
Tag:    v2.1.7

Merge branch 'MDL-31458-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE