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)
1  2 
badges/renderer.php
lib/outputrenderers.php
user/index.php

Simple merge
Simple merge
diff --cc user/index.php
Simple merge