Merge branch 'integration_MDL-38997' of github.com:totara/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 01:59:49 +0000 (09:59 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 01:59:49 +0000 (09:59 +0800)
commit315e2ad13343208c5c6782b99d261813dbd5ad1d
treecd563baef86d469904cc8984dc235b44e19c6a3c
parent2f587fb334f178161200971239d132d2ca663ede
parent60d72efb4eff40488ecc83b5c4404ff6a2a1a812
Merge branch 'integration_MDL-38997' of github.com:totara/moodle
badges/renderer.php
lib/navigationlib.php