Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 14:57:38 +0000 (16:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 14:57:38 +0000 (16:57 +0200)

Trivial merge