Merge branch 'master' into ftepp

author Wolfgang (Blub) Bumiller <blub@speed.at>

Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)

committer Wolfgang (Blub) Bumiller <blub@speed.at>

Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)
author Wolfgang (Blub) Bumiller <blub@speed.at>
Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)
committer Wolfgang (Blub) Bumiller <blub@speed.at>
Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)
diff --cc Makefile
Simple merge
diff --cc lexer.c
Simple merge
author	Wolfgang (Blub) Bumiller <blub@speed.at>
	Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)
committer	Wolfgang (Blub) Bumiller <blub@speed.at>
	Sat, 17 Nov 2012 10:34:00 +0000 (11:34 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lexer.c	patch \|	diff1 \|	diff2 \|	blob \| history