Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges
commitefc2c5171280df1f463f40193d90bf18001d7927
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:51:12 +0000 (16 13:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:51:12 +0000 (16 13:51 +1200)
treef27294b0d9eb5c119635012f200e13b332dc26a9
parentdb220c29723fc509c22f2abf15450087dc44b307
parent4c3f809b214110874f7cf11cbf22f0963e902701
Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges