Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Mar 2014 23:35:28 +0000 (00:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Mar 2014 23:35:28 +0000 (00:35 +0100)
commit170c87d808ef696b25c5412f9fa1e55efbe45bdb
treefb47187e192de5081a6b3b364839632f6e57ccf1
parent00dabc896b46097f13a3f9913871b44fedb87b70
parentfcca760ae73e637ec82cd031735020ed4a6bfcb9
Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle
lang/en/badges.php