Merge branch 'MDL-10259_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
commit1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:18:31 +0000 (11 15:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:18:31 +0000 (11 15:18 +1200)
tree1dfd89681743b46ab82654950afbcd4750821335
parent22f55d840cf86cfa148027bfe7fa18259a90c438
parent2fcb88838f230e994a3716a2fa34da1bc08431d1
Merge branch 'MDL-10259_22' of git://github.com/dmonllao/moodle into MOODLE_22_STABLE
lang/en/moodle.php