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)

Trivial merge