Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)
commit525b6ebeb9c4698908162e0f3bec6674d2bce8c3
treeaa819ef91052acc15e301a537be288fc53be851b
parentfcf0cc04b34616911b909108d4834621dcc2cd7a
parent369484bf8737e8b083a3509133c26cf799e7608e
Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges