Git merges in Moodle 2.4.0 by Yang Yang

commit bf69dc5247b8fdbc88be97d7f803c7cfca5710bc
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Wed, 27 Jun 2012 05:17:51 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 0e47cd5d976d87b7563ce933e3a2246a7633ae02
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Thu, 21 Jun 2012 05:39:05 +0800
Tag:    v2.4.0-beta

update

commit 03d3451d625f3b2a0b4a44ba08d7b0f2aa268be0
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Tue, 05 Jun 2012 05:08:16 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit ae4a9ae7792c16d671ae9264edf252055ed94c4e
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Tue, 22 May 2012 05:16:23 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit e891c68aa9dd31e75673028893d5127a708b4a50
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Tue, 15 May 2012 05:16:56 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit 87d46d187e34d701d3884aac7445dad555bc9596
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Tue, 08 May 2012 05:43:21 +0800
Tag:    v2.4.0-beta

merge

commit d0eab62ad58f70fe5d0ccb1590a5bb2f7cf35cc6
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Mon, 30 Apr 2012 06:25:26 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle

commit a96cbb5162d943f8faaa318ebd7793f63b1e9f5b
Author: Yang Yang <doraemonyoung@yahoo.com>
Date:   Fri, 13 Apr 2012 07:22:46 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of https://github.com/moodle/moodle