Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:42:30 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:42:30 +0000 (12:42 +0800)
commit8e9e62fd8e05270a10140e6f5641fdaf7cdd9659
treeaccb58b4af128df251fb42ba66826892ab94b4ed
parent29304b6c7d6a9247bd440399529d5d562b0035b7
parent61935d8ed029e0a312f8e7b0a134b8d059232b27
Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle
lang/en/admin.php