Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 23:00:11 +0000 (12:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 23:00:11 +0000 (12:00 +1300)
commit61a79e01fca1bc2ab446d6d84518e1a5ffead919
treef2b803a4f6862dd89a67407ee749274a1f4676fc
parenta9bd004c8cb0af366942e6f784b247d5769a51b0
parent455d13b7e445a41c7b30268dafb59fe565177bdf
Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges

Conflicts:
badges/upgrade.txt
badges/upgrade.txt
lang/en/badges.php
lib/badgeslib.php