Git merges in Moodle 2.3.6 by Damyon Wiese

commit 6e4274111690f9eaac968dbbda2cec8cd698ceb5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 13:04:33 +0800
Tag:    v2.3.6

Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit 1f84f2e54af746e75dea4f81c5065479c8c2ea39
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 10:56:18 +0800
Tag:    v2.3.6

Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

commit c6f24157578b17680ddd71158017a8d7139fe61f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 16:05:42 +0800
Tag:    v2.3.6

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

commit b3f8740157dcc440b3c6d77bf07be1bc888bbce4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Mar 2013 11:23:48 +0800
Tag:    v2.3.6

Merge branch 'MDL-37771-M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

commit 97846ce94c7f3bb74c63f83818c8311daea264ff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Mar 2013 13:48:18 +0800
Tag:    v2.3.6

Merge branch 'wip-MDL-34713-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE