namespace issue fixed
Merge branch 'master' of https://github.com/r-lyeh/paren

Conflicts:
	libparen.h