Merge branch 'MDL-41585' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Mar 2014 05:17:18 +0000 (13:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Mar 2014 05:17:18 +0000 (13:17 +0800)

Trivial merge