Merge branch 'master' into westmann/nljoin
tree: 639c1e5fccc2f136f7777957ff32b25628262831
  1. .gitignore
  2. algebricks/
  3. hivesterix/
  4. hyracks/
  5. pom.xml
  6. pregelix/