Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:42:37 +0000 (08:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:42:37 +0000 (08:42 +1200)
1  2 
lib/badgeslib.php

Simple merge