tree 6e9ad8f8eeaa08bdf75151d76f7dce9d06e21b92
parent 8b474353ca836d14c841e970d08d45cae4468ba9
author Stephan Herrmann <stephan@cs.tu-berlin.de> 1287693577 +0000
committer Stephan Herrmann <stephan@cs.tu-berlin.de> 1287693577 +0000

fix merge-errors in batch compiler & test