Git merges in Moodle 2.3.x by Kordan

commit 372a0cf82e0323694f68419f62a5fee2f088b238
Author: Kordan <kordan@mclink.it>
Date:   Fri, 27 Jan 2012 15:25:02 +0800
Tag:    v2.3.0-beta

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

commit c00207c0bbb98facabc6784c17ce6c598a67b3f8
Author: Kordan <kordan@mclink.it>
Date:   Fri, 20 Jan 2012 18:19:38 +0800
Tag:    v2.3.0-beta

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