Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 07:53:19 +0000 (15:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 07:53:19 +0000 (15:53 +0800)
commit225097f75a830f839a170a2b5f4910c4b207ae2d
treef5127a8afbb24df57513ed67ada7fd647557cae4
parent7e8618095631912a11c37c055fc37f54f082f259
parentb87ac3867e96c280a53c8645ea9c33db386ff35a
Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle
lang/en/admin.php