Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Thu, 19 Dec 2013 03:12:46 +0000 (16:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 19 Dec 2013 03:12:46 +0000 (16:12 +1300)

Trivial merge