Git merges in Moodle 2.2.5 by AMOS bot

commit eca810808c72f9ac62bd919168b4c047eba0c0fa
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 08 Sep 2012 08:34:46 +0800
Tag:    v2.2.5

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE