Git merges in Moodle 2.3.1 by Sam Hemelryk

commit 6019d2b2f304728e86a3f4e26f9978b48b339129
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 09:15:03 +0800
Tag:    v2.3.1

Merge branch 'MDL-32614_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE


commit 848fc30a2d2835fb1260348715818a475bac5bfb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 05:53:51 +0800
Tag:    v2.3.1

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


commit 7df86db31d74401955670dd8cdfa020cfbf2bcf5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 Jul 2012 04:26:03 +0800
Tag:    v2.3.1

Merge branch 'wip-mdl-32787-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE


commit 0afd953daf021be08db1ada2c405c95ea76d6b4c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 11:15:18 +0800
Tag:    v2.3.1

Merge branch 'w27_MDL-34115_m23_arrayofarrayssort' of git://github.com/skodak/moodle into MOODLE_23_STABLE


commit 10ff22d6f67870c4089a540c1868c57598badfdb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 Jul 2012 10:11:40 +0800
Tag:    v2.3.1

Merge branch 'MDL-33987_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE


commit 4be710795af8d143074f81111307580288a6770c
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 Jul 2012 04:22:35 +0800
Tag:    v2.3.1

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