Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:20:06 +0000 (00:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:20:06 +0000 (00:20 +0200)
commit474e0d3cd20ae9a754f937ae3136fd4b5ed2ae3a
tree10326c36af4da692198c988eae94843dad6534d5
parent036aab5daab5954176cd577e66f9787d69bb5aa3
parent7deff81f80834afc1b84a8d2b65da9d0f6aa7f7f
Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges
badges/criteria/award_criteria_courseset.php
lib/badgeslib.php
lib/moodlelib.php