Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:14:49 +0000 (15:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:14:49 +0000 (15:14 +1200)
commit1cae31e8c7772a7b8e847adc962d33312289c001
tree2b572fc0711432ec2096b856ebece9337ad5a75b
parent2cd64c93a07438485c7aee6d362f8b0bb0d47dbf
parent17f5e50f577a21f3861a3fe4b4848b4298746081
Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges