Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)

Trivial merge