Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)
commitfbf1f6fdeaa85b3ce2497f447b1435135e0d4b43
tree4b3303e596fd6bca926ff4f15f2ae53599828b1b
parent002a736eee9861e2fc4b9b3068ddacfb955ee378
parent3193b97e05b0de70e25700abd59ee445aa4c965b
Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges