...
Merge branch 'master' of https://github.com/emfa/erlang-serial

Conflicts:
	Makefile
	attic/terminal.erl