Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)

Trivial merge