Merge branch 'MDL-39011_master' of github.com:totara/openbadges
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:45:00 +0000 (10:45 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:45:00 +0000 (10:45 +0800)
commitf4f0a085d8fdc7fd6a00c77e98813dcbe61d2cdd
tree595a3a731ffbb292fce03d5da846af18d1770825
parentf4686f5df923b23e9ba89fc3cde5d692cc584d08
parent8d107e982d5952d7936c0f0a56a8dc6072b06f08
Merge branch 'MDL-39011_master' of github.com:totara/openbadges