Git merges in Moodle 2.3.7 by Aparup Banerjee

commit 45d7974cc9277bf0d4f72c34574baba763a75e40
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 03 Apr 2013 16:33:45 +0800
Tag:    v2.3.7

Merge branch 'MDL-38809_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

commit 9efd33dc6131ebf562f142d75bc30546b7d11110
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 27 Mar 2013 10:39:10 +0800
Tag:    v2.3.7

Merge branch 'MDL-38659_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE