Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)
commit648baa788c356e0604ac69031b5d288c7a2df57c
tree2f3961e65993dae055bd6c31309e0165ef336618
parentab45e3b491ba5e2a784d14ebf649259726c12fb0
parent66150286b5dd06f3c5499fb1cffa572d6d1122b4
Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle
admin/settings/courses.php
lang/en/admin.php