Git merges in Moodle 2.3.6 by Eloy Lafuente (stronk7)

commit 51f55920b5041c76d49f4248eb5ad5bdf8fc07d4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:14:59 +0800
Tag:    v2.3.6

Merge branch 'MDL-38268-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE

commit a558b8415bbcec36a8f279d3a5063b8434a9c7b4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 08:09:59 +0800
Tag:    v2.3.6

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

commit cf6fdbd1b070913f4622e5d8cb8762f8f4b66e13
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Mar 2013 05:58:12 +0800
Tag:    v2.3.6

Merge branch 'wip-mdl-38332-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

commit 761dfda279e724536b84e129bf752776030070e3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:55:19 +0800
Tag:    v2.3.6

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

commit 57b9d94e8974d3345fd45cb55d03cdf11fb37876
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:25:21 +0800
Tag:    v2.3.6

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

commit 4f558e2741cd8f64fd75e5dadf02cb351cfd130b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Mar 2013 07:22:33 +0800
Tag:    v2.3.6

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