Merge branch 'w15_MDL-39132_m25_badgesettings' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Apr 2013 00:07:15 +0000 (02:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Apr 2013 00:07:15 +0000 (02:07 +0200)

Trivial merge