Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges

author Damyon Wiese <damyon@moodle.com>

Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)

committer Damyon Wiese <damyon@moodle.com>

Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
author Damyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
committer Damyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
diff --cc lang/en/badges.php
Simple merge
diff --cc lib/navigationlib.php
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)
		1	2
lang/en/badges.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/navigationlib.php	patch \|	diff1 \|	diff2 \|	blob \| history