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)
commit6ac0b011759e3b1f3eccd85386325c83e715900e
tree86a92b80df292e15096d65f825ac1276f820d921
parent4c9da232d05f324d4f077aace13393b2da7b2c27
parentf85ce0d900e3fdcc473879703c72d983d500d692
Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges

Conflicts:
badges/assertion.php
badges/assertion.php