Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 13:20:44 +0000 (14:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 13:20:44 +0000 (14:20 +0100)
commit4a27b061bf27c6d7f96e4e9f4f69acfd548a4ba2
tree3a1ca5e439bbe2cb1e0f2cc516c1116d1b32ca6a
parentc4058e6e0c9e70aa77f671bd088e8bfc4eef88ad
parentd9fe7dbe788068122bfe954a7dcf1a0ae70dfc50
Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges