Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 07:10:49 +0000 (15:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 07:10:49 +0000 (15:10 +0800)
1  2 
lang/en/badges.php

Simple merge