Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 07:01:26 +0000 (15:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 07:01:26 +0000 (15:01 +0800)
1  2 
lib/badgeslib.php

Simple merge