Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 02:40:48 +0000 (15:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 02:40:48 +0000 (15:40 +1300)
Conflicts:
badges/assertion.php


No differences found