Merge branch 'MDL-48975_rego_strings2' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 09:12:35 +0000 (09:12 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 09:12:35 +0000 (09:12 +0000)

Trivial merge