Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 05:30:40 +0000 (13:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 05:30:40 +0000 (13:30 +0800)
1  2 
badges/renderer.php

Simple merge