c
d
Merge branch 'master' of https://github.com/mdxys/commentparse

Conflicts:
	nale/config/nale/shell.conf