Git merges in Moodle x.x.x by Mayank Gupa

commit 3cf721bf231a2d6ebe06a70a91c48e20ef2568a0
Author: Mayank Gupa <mayankgupta2005@gmail.com>
Date:   Mon, 12 Dec 2011 15:50:44 +0800
Tag:    v2.3.0-beta

Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30577

commit 7ec0b1a936eb29dc9d693ef618b28bd0457dc3cb
Author: Mayank Gupa <mayankgupta2005@gmail.com>
Date:   Mon, 12 Dec 2011 13:23:23 +0800
Tag:    v2.3.0-beta

Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30576