Merge branch 'MDL-49543' of https://github.com/totara/openbadges
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 23:51:01 +0000 (00:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 23:51:01 +0000 (00:51 +0100)

Trivial merge