Merge branch 'master' of yap.dcc.fc.up.pt:yap-6

Conflicts:
	C/absmi.c
This commit is contained in:
Vitor Santos Costa 2010-10-12 23:22:23 +01:00
commit 755a57fdbd