Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 12:54:01 +0000 (13:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 12:54:01 +0000 (13:54 +0100)
commit356fd5bae7e149baad70180e80a475f70c0693e2
treede512c8665911f7273b67ed4d656b16c7b5811a4
parent290b156276080dfc9490f94602cc2009905ccb4b
parent32bd11cb395640c8a0456766f72074171349cbe8
Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle
badges/renderer.php
lib/outputrenderers.php
user/index.php