Merge branch 'MDL-39825_dev_master' of https://github.com/totara/openbadges
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 08:40:24 +0000 (16:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 08:40:24 +0000 (16:40 +0800)
1  2 
lib/navigationlib.php

Simple merge