Git merges in Moodle 2.4.0 by unknown

commit af4893059eebf5708dd63fd0a6c5dee2df6d2624
Author: unknown <02451646@.(none)>
Date:   Wed, 11 Apr 2012 08:08:39 +0800
Tag:    v2.4.0-beta

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

commit a7e558bc5acdcf44674320d57f8c288f48d3663a
Author: unknown <02451646@.(none)>
Date:   Fri, 30 Mar 2012 12:16:44 +0800
Tag:    v2.4.0-beta

Merge branch 'master' of github.com:Lightwork-Marking/moodle

commit 404238ae51bf27049478aff24a4416299047e1e9
Author: unknown <02451646@.(none)>
Date:   Fri, 30 Mar 2012 08:37:54 +0800
Tag:    v2.4.0-beta

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