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)

Trivial merge