Merge branch 'MDL-49170_master' of https://github.com/totara/openbadges
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:43:17 +0000 (23:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:43:17 +0000 (23:43 +0100)
commit58d5cc53604aa4181adc1cddc39114f40673a2a3
tree74b1013fd694b543002167bf47d039eb9e96febc
parent6add8c594daac30ed50d3a1909aeca722aa506ad
parentaebac578dbf4b6f2a1ac6908bab9bf15d1c44213
Merge branch 'MDL-49170_master' of https://github.com/totara/openbadges