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)
commita6673a8b04357456adb12b0808e95c30fcba9750
tree1b44f1de66941de378b8449a6d347e69d3d213a0
parentbc90ad107ae07c3c90b2e0e4ac1868083d3079c5
parent8853cd202c74d90721227ec2246b2b43696fd4e6
Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle
badges/renderer.php