Merge branch 'MDL-39461_dev' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:59:58 +0000 (08:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:59:58 +0000 (08:59 +1200)

Trivial merge