Git merges in Moodle 2.1.9 by Eloy Lafuente (stronk7)

commit 828bb475ac6451da9204e9e8d595a7802e255f7d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 10 Nov 2012 01:58:33 +0800
Tag:    v2.1.9

Merge branch 'MDL-25948_m21' of git://github.com/markn86/moodle into MOODLE_21_STABLE

commit f772bb2b97c308ebeddc7b60375ad9d51df8a5de
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 15 Oct 2012 06:08:04 +0800
Tag:    v2.1.9

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE