Git merges in Moodle 2.3.6 by Aparup Banerjee

commit d5fc9f3d775937625f4df441de03eb77af0d69e6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Mar 2013 11:05:43 +0800
Tag:    v2.3.6

Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE


commit df6266825b1ec967b70f4aceca1c4df3f3663190
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 15:50:55 +0800
Tag:    v2.3.6

Merge branch 'MDL-35615_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE


commit 771053bd830410b435fe102b20fd4ccabbd4dd4a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:38:10 +0800
Tag:    v2.3.6

Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE


commit c2fb582ef5491b59e59b37df692cc2c8069fdda5
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 12 Mar 2013 13:28:34 +0800
Tag:    v2.3.6

Merge branch 'MDL-35582_message_labels_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE