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)

Trivial merge