Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Conflicts:
	configure
This commit is contained in:
Vítor Santos Costa
2014-02-10 23:57:18 +00:00
21 changed files with 888 additions and 1018 deletions

966
configure vendored

File diff suppressed because it is too large Load Diff