Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
commita02e36d68230edd9910ade031662b08aa08faac7
tree4cdd8fc935572515ff38c310b890a0a00230e2b4
parent2c59e0ffaa830ebb0eb1b4038cb9a6e5a4758e13
parent85d7399e2041a07eeecb60097637a43f660f3d73
Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges
lang/en/badges.php
lib/navigationlib.php