Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 11:42:20 +0000 (21:42 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 11:42:20 +0000 (21:42 +1000)
commit0aab5cbc5921d27cc332af18c175c04339a0e95d
tree7bbf0a0fdafbe869a18ec84729724ea7b2e06eb9
parent4fa30a89470379458a14d62e5c2bfffcad9d8ac0
parent4d7d17ddcc2213da20df783d43ee733490710eb7
Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges