Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jul 2014 00:07:05 +0000 (12:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jul 2014 00:07:05 +0000 (12:07 +1200)
commit6a91c41a49eb6676a519a798dc5c6e855a0aa934
treebdfa277f6f107a79c141016243ab60f091c6a5e1
parent3b674f5d0a5f4a9d5d19a7bc5dca89d63243c8fb
parent9f7379e9b46d9c268612de753d6d71378253632d
Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle
lang/en/admin.php
version.php