Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)

Trivial merge