Git merges in Moodle 2.2.11 by Damyon Wiese

commit 464c85dba8f2f2f2518db18142e9228f9cd6269b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 30 May 2013 11:26:38 +0800
Tag:    v2.2.11

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE


commit 94a943f31cf406f88675dd0dc2bb39cfcc34623d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 24 May 2013 13:11:18 +0800
Tag:    v2.2.11

Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE