Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)

Trivial merge