Git merges in Moodle 2.1.7 by Aparup Banerjee

commit 236534f192513dd3b7bb1188c3b07722abe0c7f5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 20 Jun 2012 17:18:46 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-33811-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE

commit 9a36598bac36a51f9a75f2b97d64793cd5c5b1c7
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Jun 2012 11:28:11 +0800
Tag:    v2.1.7

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

commit b10a4873341163808f4f00044e51b78bdb619329
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Mon, 11 Jun 2012 13:56:03 +0800
Tag:    v2.1.7

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

commit 97f8f66cc3ec886d5d5a5af8012aee269eb18b3d
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 05 Jun 2012 15:16:14 +0800
Tag:    v2.1.7

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

commit 323d76708b7bcc56a34748c8f6ffc2e09bf8bdab
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 15:18:16 +0800
Tag:    v2.1.7

Merge branch 'MDL-33040-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE

commit 3a2d36354281a76398aaad0e11d65a5c6e8e74d8
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 31 May 2012 14:15:59 +0800
Tag:    v2.1.7

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

commit 65a312fa32bb95bc76e355cee58c557127b3f664
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 24 May 2012 15:45:03 +0800
Tag:    v2.1.7

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

commit 3cf17d040e1564e72e6afa7a61e2882196dc8fe0
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 16:06:23 +0800
Tag:    v2.1.7

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

commit d9e11780303dbee926ae6eeb36e4f6c3896e4c85
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 16 May 2012 14:11:20 +0800
Tag:    v2.1.7

Merge branch 'wip-MDL-32991-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

commit 6030656b88971236b95448e66fd243192a1e424a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 16:18:53 +0800
Tag:    v2.1.7

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

commit 336c4263e934faa880a137373d42d85e82ac30b3
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 15 May 2012 11:09:13 +0800
Tag:    v2.1.7

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