Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 05:06:30 +0000 (13:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 05:06:30 +0000 (13:06 +0800)
commitf329801959cd31d8834f7d2f107e07e79ecb9827
tree75923980f88dc3c341f8af121d25d93e2b0fa54d
parentc821f113ccaac68a3e40ad0f3a0e457d58767136
parent343534a855907b90477a1e62c9284caa30273d08
Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges

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