tree 866a5c928b96dd2c6203df991b8dbcef5d7b419c
parent 345faf3a25e38fa84102dfe8b09cee810557abcd
parent ad4cb0167ecc0861f74282aa9902e1b68ecea999
author Akron <nils@diewald-online.de> 1477333618 +0200
committer Gerrit Code Review <gerrit2@korap.ids-mannheim.de> 1477333618 +0200

Merge changes Ifdcfb816,I51994658

* changes:
  Fixed conflict
  Fixed rootdir in meta parser