Damyon Wiese e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-07 10:41:44 +08:00
..