Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 5 Apr 2013 09:10:14 +0000 (17:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 5 Apr 2013 09:10:14 +0000 (17:10 +0800)

Trivial merge