Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 22:05:59 +0000 (11:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 22:05:59 +0000 (11:05 +1300)
1  2 
badges/renderer.php
lib/deprecatedlib.php

Simple merge
Simple merge