Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges
commitefbed79063a28c39b9cb4bef31d0c5581f0e3702
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 05:17:31 +0000 (15 13:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 05:17:31 +0000 (15 13:17 +0800)
treec29b1cd9a01f12945eb928f6c5ea7ef61ddb6c81
parent57fbd5f91f9036e5b29e9ab4b02448a41d80eea2
parente477ec0a3945d752aae0d4bc545e895d15bd7aea
Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges