Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 01:34:31 +0000 (09:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 01:34:31 +0000 (09:34 +0800)
commit02c6bd358f98404e0ff4f4a99fe0dd5b06f537ad
tree3facccb241472c4d42d3c028a37eaea536393750
parente916eb407c2cf85d78d47a84d9783e9761158535
parent5a25566060ee3b617d119763b9053c063932b0d1
Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle

Conflicts:
lang/en/moodle.php
lang/en/admin.php
mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php