Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Aug 2014 18:14:15 +0000 (19:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Aug 2014 18:14:15 +0000 (19:14 +0100)

Trivial merge