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)
commit5a0443cc14d75dd71270d9d013c96f7166e0910d
tree6006fdcba5a2999a1ac722bc6ab362bd335928e5
parent4fd1861c8fc3c2dbcaa4dcac36d67b3fa0f5be32
parentb7acd9be501b4a4a2947957b158dcc09d9fc781a
Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle