Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 01:37:49 +0000 (14:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 01:37:49 +0000 (14:37 +1300)

Trivial merge