Merge branch 'MDL-50646-master-preflang' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 05:35:44 +0000 (13:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 05:35:44 +0000 (13:35 +0800)

Trivial merge