Git merges in Moodle 2.1.8 by Eloy Lafuente (stronk7)

commit f2316850509e8ff79b89be8da320e215cd7302db
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 10 Aug 2012 02:46:52 +0800
Tag:    v2.1.8

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