julmis' last commit contained garbage from a CVS merge conflict he obviously had, so I 'm removing them. Good thing they weren't mixed with deliberate changes!
julmis' last commit contained garbage from a CVS merge conflict he obviously had,
so I 'm removing them. Good thing they weren't mixed with deliberate changes!

dilawar/moodle