Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 06:45:34 +0000 (14:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 06:45:34 +0000 (14:45 +0800)

Trivial merge