Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)
commit7154f954c7ce99935bc847ba82c836bbe7a3385f
treee3fb78d17754cc0c2e79e4e58080e222151724fa
parent3c459b6300e79d267a553fb46b8c8853384bd402
parent1f258cd8ceae64e80a4f0cef82c03beb067adf70
Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges