Git merges in Moodle 2.4.0 by Wirianto Djunaidi

commit 6998831d31af46da86db48d8e50687bb66251142
Author: Wirianto Djunaidi <wirianto.djunaidi@gmail.com>
Date:   Wed, 11 Jul 2012 16:31:34 +0800
Tag:    v2.4.0-beta

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

commit bccdff582f876a8c74e08d78b523a5f51ea2fffb
Author: Wirianto Djunaidi <wirianto.djunaidi@gmail.com>
Date:   Fri, 02 Mar 2012 03:45:49 +0800
Tag:    v2.4.0-beta

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

commit c0c175e6c80b8054ea5c933696077798e3f6862e
Author: Wirianto Djunaidi <wirianto.djunaidi@gmail.com>
Date:   Tue, 21 Feb 2012 11:32:23 +0800
Tag:    v2.4.0-beta

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