Merge branch 'master' of git://gitorious.org/intercal/intercal

Conflicts:
	pit/Makefile

diff --cc pit/Makefile
index 2cea8bd69721d937fea9849abf31ad44a1729183,da841eaf62c64db9acbfd4bdc150c26f9170d1cc..5c21c74f88e66701008c9e9a1cc1d262f1875a0a
--- 1/pit/Makefile
--- 2/pit/Makefile
+++ b/pit/Makefile
@@@ -109,7 -116,9 +116,9 @@@ test: $(TARGETS
        @cat sort.tst | ./sort | ./regresscheck sort
        @cat tpk.tst | ./tpk | ./regresscheck tpk
        @cat unlambda.tst | ./unlambda | ./regresscheck unlambda
 -      @cat yapp.tst | yapp >yapptest.i && $(ICK) yapptest.i && yapptest | regresscheck -c yapp.tst yapp; rm -f yapptest.i yapptest
 +      @cat yapp.tst | ./yapp >yapptest.i && $(ICK) yapptest.i && ./yapptest | ./regresscheck -c yapp.tst yapp; rm -f yapptest.i yapptest
+       @cat tests/ais1.tst | ./tests/ais1 | ./regresscheck tests/ais1 
+       @cat tests/ais2.tst | ./tests/ais2 | ./regresscheck tests/ais2 
        @./tests/count | ./regresscheck tests/count 
        @./tests/hello | ./regresscheck tests/hello 
        @./tests/ignorret | ./regresscheck tests/ignorret 

diff --cc src/oil.y
Simple merge