Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)
commit0527e023906fcf802c1589126efc1ac6a7d999c9
tree0c6ec90c4f9d1c86363df851d216f65da9a8da4c
parent52b7e8aa58d9a794c64a3c8aa2dddf3e773bf5b8
parentab8aa5828ff41bf37f0039908e52e19c91411b9d
Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges