Git merges in Moodle 2.1.8 by Sam Hemelryk

commit c54cd379ac317dfa325fbc170f57b6887bad2c22
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 10 Jul 2012 08:09:06 +0800
Tag:    v2.1.8

Merge branch 'MDL-29470-21' of git://github.com/FMCorz/moodle into MOODLE_21_STABLE


commit 5c89dd5d186f1f0d2d9e49296c4fb7e00d004299
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:28:26 +0800
Tag:    v2.1.8

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


commit 67fb1b666e10af499a6b5b4d0178397857a02adc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 09 Jul 2012 06:21:47 +0800
Tag:    v2.1.8

Merge branch 'MDL-33514-21' of git://github.com/danpoltawski/moodle into MOODLE_21_STABLE