Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:28:31 +0000 (15:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:28:31 +0000 (15:28 +0800)
1  2 
badges/renderer.php

Simple merge