Git merges in Moodle 2.4.0 by Damyon Wiese

commit fd637d38ac8195feb22f0f4a3022f3d99dbd918f
Author: Damyon Wiese <damyon.wiese@netspot.com.au>
Date:   Thu, 13 Sep 2012 10:02:55 +0800
Tag:    v2.4.0-beta

Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration