Merge branch 'MDL-39049_master' of github.com:totara/openbadges
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:30:10 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:30:10 +0000 (10:30 +0800)
1  2 
badges/renderer.php

Simple merge