Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 19:54:46 +0000 (08:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 19:54:46 +0000 (08:54 +1300)

Trivial merge